April 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main Makefile,1.16,1.17 cfg-mplayer.h,1.21,1.22 configure,1.21,1.22 help_mp.h,1.7,1.8 lirc_mp.c,1.2,1.3 mplayer.c,1.67,1.68
by GEREOFFY 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv31229 Modified Files: Makefile cfg-mplayer.h configure help_mp.h lirc_mp.c mplayer.c Log Message: qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+ Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** Makefile 2001/04/15 19:24:30 1.16 --- Makefile 2001/04/15 20:31:57 1.17 *************** *** 23,28 **** BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c ! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o mixer.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 --- 23,28 ---- BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c ! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 *************** *** 33,37 **** # .PHONY: all clean ! all: $(PRG) $(PRG_CFG) # $(PRG_AVIP) --- 33,37 ---- # .PHONY: all clean ! all: version.h $(PRG) $(PRG_CFG) # $(PRG_AVIP) *************** *** 66,70 **** $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a - @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow ; do $(MAKE) -C $$a; done $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++ --- 66,69 ---- *************** *** 78,82 **** $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) ! $(PRG_CFG): codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING --- 77,81 ---- $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) ! $(PRG_CFG): .depend codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING *************** *** 100,103 **** --- 99,112 ---- makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null + # rebuild at every config.h/config.mak change: + version.h: config.h config.mak Makefile + $(MAKE) distclean + ./version.sh + + # rebuild at every CVS update: + ifneq ($(wildcard CVS/Entries),) + version.h: CVS/Entries + endif + # # include dependency files if they exist *************** *** 106,107 **** --- 115,117 ---- include .depend endif + Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** cfg-mplayer.h 2001/04/15 19:26:33 1.21 --- cfg-mplayer.h 2001/04/15 20:31:57 1.22 *************** *** 7,81 **** extern char *fb_mode_cfgfile; extern char *fb_mode_name; ! extern int fb_mode_depth; #endif struct config conf[]={ ! /* name, pointer, type, flags, min, max */ ! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ ! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, ! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, ! {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0}, ! {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, #ifdef HAVE_FBDEV ! {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! // {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32}, #endif ! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0}, ! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0}, ! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0}, ! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0}, ! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0}, ! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0}, ! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0}, ! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0}, ! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0}, ! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10}, ! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, ! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, ! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, ! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0}, ! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63}, ! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, ! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0}, ! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0}, {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1}, {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0}, ! {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, ! ! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0}, ! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1}, ! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100}, ! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0}, ! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {NULL, NULL, 0, 0, 0, 0} }; --- 7,83 ---- extern char *fb_mode_cfgfile; extern char *fb_mode_name; ! extern char *monitor_hfreq_str; ! extern char *monitor_vfreq_str; ! extern char *monitor_dotclock_str; #endif struct config conf[]={ ! /* name, pointer, type, flags, min, max */ ! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ ! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, ! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, #ifdef HAVE_FBDEV ! {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0}, #endif ! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0}, ! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0}, ! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0}, ! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0}, ! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0}, ! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0}, ! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0}, ! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0}, ! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0}, ! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10}, ! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, ! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, ! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, ! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0}, ! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63}, ! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, ! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0}, ! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0}, {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1}, {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0}, ! {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, ! ! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0}, ! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1}, ! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100}, ! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0}, ! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {NULL, NULL, 0, 0, 0, 0} }; Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** configure 2001/04/15 18:35:16 1.21 --- configure 2001/04/15 20:31:57 1.22 *************** *** 7,14 **** # Changes in reversed order: # - # 2001/04/15 by Pontscho - # - added --disable-select option - # - added X11DIR variable in config.mak and fix syncfb Makefile -L/usr/X11/lib bug - # # 2001/03/24 by Mike Graffam: # - added autodetect code for XF86VidMode, along with explicit --enable-vm --- 7,10 ---- *************** *** 94,101 **** --enable-termcap use termcap database for key codes --enable-xmmp use XMMP audio drivers ! --enable-lirc enable LIRC ( remote control ) support ! ! --disable-select disable audio select() support ( for example required this ! option ALSA or Vortex2 driver ) --with-x11libdir=DIR X library files are in DIR --- 90,94 ---- --enable-termcap use termcap database for key codes --enable-xmmp use XMMP audio drivers ! --enable-lirc enable LIRC (remote control) support --with-x11libdir=DIR X library files are in DIR *************** *** 138,142 **** --- 131,145 ---- _cc=gcc + _x11=auto + _x11libdir= + if [ -e /usr/X11R6 ]; then + _x11libdir=-L/usr/X11R6/lib + else + if [ -e /usr/X11 ]; then + _x11libdir=-L/usr/X11/lib + fi + fi + for ac_option do *************** *** 145,148 **** --- 148,160 ---- _cc=`echo $ac_option | cut -d '=' -f 2` ;; + --with-x11libdir=*) + _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` + ;; + --enable-x11) + _x11=yes + ;; + --disable-x11) + _x11=no + ;; esac done *************** *** 171,175 **** _xv=no _vm=no - _x11=no _3dfx=no _syncfb=no --- 183,186 ---- *************** *** 180,184 **** _dga2=no _svga=no ! _fbdev=no _lirc=no _xdpms=no --- 191,195 ---- _dga2=no _svga=no ! _fbdev=yes _lirc=no _xdpms=no *************** *** 189,197 **** _gllib= _sdllib= - _x11lib= _xvlib= ! _xlibdir= ! ! _select='#define HAVE_AUDIO_SELECT' for i in `echo $pparam`; do --- 200,205 ---- _gllib= _sdllib= _xvlib= ! _x11lib= for i in `echo $pparam`; do *************** *** 230,240 **** done - if [ -e /usr/X11R6 ]; then - _x11libdir=-L/usr/X11R6/lib - else - if [ -e /usr/X11 ]; then - _x11libdir=-L/usr/X11/lib - fi - fi _win32libdirnotify=no --- 238,241 ---- *************** *** 376,388 **** - # check GL & X11 & Xext & Xv & SDL & termcap libs - - $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes - $_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes ! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \ { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } --- 377,383 ---- $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes ! ! $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \ { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } *************** *** 390,394 **** # this is very buggy & experimental code, use it only if you really need it!! _have_sdl=no ! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes _termcap=no --- 385,389 ---- # this is very buggy & experimental code, use it only if you really need it!! _have_sdl=no ! $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes _termcap=no *************** *** 397,402 **** _binutils=no as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes ! # LGB: Check DGA cat > $TMPC << EOF --- 392,418 ---- _binutils=no as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes + + # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) -------------- + + if [ $_x11 = auto ]; then + _x11=no + $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes + fi + + if [ $_x11 = yes ]; then + + $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes + $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes + + $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes + + cat > $TMPC << EOF + #include <GL/gl.h> + int main( void ) { return 0; } + EOF + $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \ + { _gl=no; echo "GL includes not found!";} ! $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes cat > $TMPC << EOF *************** *** 407,411 **** EOF - _dga=no $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes # Note: the -lXxf86vm library is the VideoMode extension and though it's --- 423,426 ---- *************** *** 415,420 **** # If you run into problems, remove '-lXxf86vm'. - # --- - # Check if DGA is 2.0 or greater cat > $TMPC << EOF --- 430,433 ---- *************** *** 427,449 **** _dga2=no $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes - ! cat > $TMPC << EOF ! #include <GL/gl.h> ! int main( void ) { return 0; } ! EOF ! ! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \ ! { _gl=no; echo "GL includes not found!";} rm -f $TMPC $TMPO - - if [ $_x11 = 'yes' ]; then - if [ $_mga = 'yes' ]; then - _xmga=yes - fi - fi - # --- --- 440,448 ---- _dga2=no $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes ! fi rm -f $TMPC $TMPO # --- *************** *** 495,501 **** _vm=yes ;; - --enable-x11) - _x11=yes - ;; --enable-3dfx) _3dfx=yes --- 494,497 ---- *************** *** 519,525 **** _lirc=yes ;; - --enable-select) - _select='#define HAVE_AUDIO_SELECT' - ;; --disable-sse) _sse=no --- 515,518 ---- *************** *** 553,559 **** _vm=no ;; - --disable-x11) - _x11=no - ;; --disable-mlib) _mlib=no --- 546,549 ---- *************** *** 574,583 **** _termcap=no ;; - --disable-select) - _select='#undef HAVE_AUDIO_SELECT' - ;; - --with-x11libdir=*) - _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` - ;; --with-win32libdir=*) _win32libdir=`echo $ac_option | cut -d '=' -f 2` --- 564,567 ---- *************** *** 590,593 **** --- 574,579 ---- _y=`echo $ac_option | cut -d '=' -f 2` ;; + --with-x11libdir=*) + ;; --cc=*) ;; *************** *** 595,598 **** --- 581,590 ---- done + if [ $_x11 = 'yes' ]; then + if [ $_mga = 'yes' ]; then + _xmga=yes + fi + fi + # to screen. echo "Using C compiler: $_cc" *************** *** 684,693 **** AR=ar CC=$_cc - X11DIR=$_x11libdir # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! # X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib ! X_LIBS=\$(X11DIR) $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs --- 676,683 ---- AR=ar CC=$_cc # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs *************** *** 848,852 **** If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ ! $_select /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm) --- 838,842 ---- If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ ! #define HAVE_AUDIO_SELECT /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm) Index: help_mp.h =================================================================== RCS file: /cvsroot/mplayer/main/help_mp.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** help_mp.h 2001/04/15 18:35:17 1.7 --- help_mp.h 2001/04/15 20:31:57 1.8 *************** *** 1,9 **** static char* banner_text= "\n\n" ! "MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi(a)esp-team.scene.hu>\n" "\n"; static char* help_text= ! "Usage: mplayer [options] [path/]name\n" "\n" " Options:\n" --- 1,9 ---- static char* banner_text= "\n\n" ! "MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi(a)thot.banki.hu>\n" "\n"; static char* help_text= ! "\nUsage: mplayer [options] [path/]name\n" "\n" " Options:\n" *************** *** 41,45 **** " + or - adjust audio delay by +/- 0.1 second\n" " o toggle OSD: none / seek / seek+timer\n" - " * or / increase or decrease volume\n" - " m or c use mixer master or pcm channel\n" "\n"; --- 41,43 ---- Index: lirc_mp.c =================================================================== RCS file: /cvsroot/mplayer/main/lirc_mp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** lirc_mp.c 2001/04/15 18:35:17 1.2 --- lirc_mp.c 2001/04/15 20:31:57 1.3 *************** *** 96,104 **** {"RWND" , KEY_LEFT}, {"FRWND" , KEY_DOWN}, ! {"PAUSE", 'p'}, ! {"INCVOL", '*'}, ! {"DECVOL", '/'}, ! {"MASTER", 'm'}, ! {"PCM", 'c'} }; --- 96,100 ---- {"RWND" , KEY_LEFT}, {"FRWND" , KEY_DOWN}, ! {"PAUSE", 'p'} }; Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** mplayer.c 2001/04/15 19:17:10 1.67 --- mplayer.c 2001/04/15 20:31:57 1.68 *************** *** 33,37 **** #include "cfgparser.h" - #include "mixer.h" #include "cfg-mplayer-def.h" --- 33,36 ---- *************** *** 1579,1594 **** case 'o': // toggle OSD osd_level=(osd_level+1)%3; - break; - case '*': - mixer_incvolume(); - break; - case '/': - mixer_decvolume(); - break; - case 'm': - mixer_usemaster=1; - break; - case 'c': - mixer_usemaster=0; break; } --- 1578,1581 ---- _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_svga.c,1.13,1.14
by Zoltan Mark Vician 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv21603/libvo Modified Files: vo_svga.c Log Message: All available videomodes support added. Index: vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** vo_svga.c 2001/04/14 18:19:40 1.13 --- vo_svga.c 2001/04/15 19:35:34 1.14 *************** *** 42,81 **** static uint32_t x_pos, y_pos; // Position ! // Order must not change! ! #define _640x480x32K 0 // 17 ! #define _640x480x64K 1 // 18 ! #define _640x480x16M 2 // 19 ! #define _640x480x16M32 3 // 34 ! #define _800x600x32K 4 // 20 ! #define _800x600x64K 5 // 21 ! #define _800x600x16M 6 // 22 ! #define _800x600x16M32 7 // 35 ! #define _1024x768x32K 8 // 23 ! #define _1024x768x64K 9 // 24 ! #define _1024x768x16M 10 // 25 ! #define _1024x768x16M32 11 // 36 ! #define VID_MODE_NUM 12 ! ! static uint8_t vid_modes[VID_MODE_NUM]; ! static vid_mode_nums[VID_MODE_NUM] = {17,18,19,34,20,21,22,35,23,24,25,36}; ! static uint8_t vid_mode; ! static uint8_t bpp; static uint32_t pformat; static uint8_t checked = 0; ! static uint8_t bpp_conv = 0; ! static void checksupportedmodes() { ! int i; checked = 1; vga_init(); vga_disabledriverreport(); ! for (i = 0; i < VID_MODE_NUM; i++) { ! if (vga_hasmode(vid_mode_nums[i]) > 0) ! vid_modes[i] = 1; ! else vid_modes[i] = 0; ! } } --- 42,115 ---- static uint32_t x_pos, y_pos; // Position ! // SVGAlib - list of detected modes ! typedef struct vga_modelist_s { ! uint16_t modenum; ! vga_modeinfo modeinfo; ! struct vga_modelist_s *next; ! } vga_modelist_t; ! ! vga_modelist_t *modelist = NULL; + static uint8_t bpp; + static uint8_t bpp_conv = 0; static uint32_t pformat; + #define BPP_15 1 + #define BPP_16 2 + #define BPP_24 4 + #define BPP_32 8 + static uint8_t bpp_avail = 0; + static uint8_t checked = 0; ! ! static int add_mode(uint16_t mode, vga_modeinfo minfo) { ! vga_modelist_t *list; ! if (modelist == NULL) { ! modelist = malloc(sizeof(vga_modelist_t)); ! modelist->modenum = mode; ! modelist->modeinfo = minfo; ! modelist->next = NULL; ! if (modelist == NULL) { ! printf("vo_svga: add_mode() failed. Not enough memory for modelist."); ! return(1); // error ! } ! } else { ! list = modelist; ! while (list->next != NULL) ! list = list->next; ! list->next = malloc(sizeof(vga_modelist_t)); ! if (list->next == NULL) { ! printf("vo_svga: add_mode() failed. Not enough memory for modelist."); ! return(1); // error ! } ! list = list->next; ! list->modenum = mode; ! list->modeinfo = minfo; ! list->next = NULL; ! } ! } ! ! static int checksupportedmodes() { ! uint16_t i; ! vga_modeinfo *minfo; checked = 1; vga_init(); vga_disabledriverreport(); ! for (i = 1; i < vga_lastmodenumber(); i++) ! if (vga_hasmode(i) > 0) { ! minfo = vga_getmodeinfo(i); ! switch (minfo->colors) { ! case 32768: bpp_avail |= BPP_15; break; ! case 65536: bpp_avail |= BPP_16; break; ! } ! switch (minfo->bytesperpixel) { ! case 3: bpp_avail |= BPP_24; break; ! case 4: bpp_avail |= BPP_32; break; ! } ! if (add_mode(i, *minfo)) ! return(1); ! } } *************** *** 83,157 **** uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { ! uint32_t wid = (d_width > 0 ? d_width : width); if (!checked) { ! checksupportedmodes(); // Looking for available video modes } pformat = format; ! // -bpp check if (!vo_dbpp) { if (format == IMGFMT_YV12) bpp = 32; else bpp = format & 255; } else { bpp = vo_dbpp; switch (bpp) { ! case 32: if (!(vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32])) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp); return(1); } ! case 24: if (!(vid_modes[_640x480x16M] | vid_modes[_800x600x16M] | vid_modes[_1024x768x16M])) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp); return(1); } ! case 16: if (!(vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K])) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp); return(1); } ! case 15: if (!(vid_modes[_640x480x32K] | vid_modes[_800x600x32K] | vid_modes[_1024x768x32K])) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp); return(1); } } - } - - if (wid > 800) - switch (bpp) { - case 32: vid_mode = 36; break; - case 24: vid_mode = bpp_conv ? 36 : 25; bpp = 32; break; - case 16: vid_mode = 24; break; - case 15: vid_mode = bpp_conv ? 24 : 23; bpp = 16; break; } ! else ! if (wid > 640) ! switch (bpp) { ! case 32: vid_mode = 35; break; ! case 24: vid_mode = bpp_conv ? 35 : 22; bpp = 32; break; ! case 16: vid_mode = 21; break; ! case 15: vid_mode = bpp_conv ? 21 : 20; bpp = 16; break; ! } ! else switch (bpp) { ! case 32: vid_mode = 34; break; ! case 24: vid_mode = bpp_conv ? 34 : 19; bpp = 32; break; ! case 16: vid_mode = 18; break; ! case 15: vid_mode = bpp_conv ? 18 : 17; bpp = 16; break; } ! if (bpp_conv) ! bppbuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (!bppbuf) { ! printf("vo_svga: Not enough memory for buffering!"); ! uninit(); ! return (1); } ! vga_setlinearaddressing(); if (vga_setmode(vid_mode) == -1){ printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode); return(1); // error } if (gl_setcontextvga(vid_mode)){ printf("vo_svga: gl_setcontextvga(%d) failed.\n",vid_mode); return(1); // error } --- 117,235 ---- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { ! uint32_t req_w = (d_width > 0 ? d_width : width); ! uint32_t req_h = (d_height > 0 ? d_height : height); ! uint16_t vid_mode = 0; ! uint8_t widescreen = (((req_w*1.0)/req_h) > (4.0/3)) ? 1 : 0; ! vga_modelist_t *list = modelist; if (!checked) { ! if (checksupportedmodes()) // Looking for available video modes ! return(1); } + bpp_avail = 0; + while (list != NULL) { + if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) { + switch (list->modeinfo.colors) { + case 32768: bpp_avail |= BPP_15; break; + case 65536: bpp_avail |= BPP_16; break; + } + switch (list->modeinfo.bytesperpixel) { + case 3: bpp_avail |= BPP_24; break; + case 4: bpp_avail |= BPP_32; break; + } + } + list = list->next; + } + pformat = format; ! // bpp check ! bpp_conv = 0; if (!vo_dbpp) { if (format == IMGFMT_YV12) bpp = 32; else bpp = format & 255; + switch (bpp) { + case 32: if (!(bpp_avail & BPP_32)) { + printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp); + printf("vo_svga: Maybe you should try -bpp\n"); + return(1); + } + break; + case 24: if (!(bpp_avail & BPP_24)) + if (!(bpp_avail & BPP_32)) { + printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp); + printf("vo_svga: Maybe you should try -bpp\n"); + return(1); + } else { + bpp = 32; + bpp_conv = 1; + } + break; + case 16: if (!(bpp_avail & BPP_16)) { + printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp); + printf("vo_svga: Maybe you should try -bpp\n"); + return(1); + } + break; + case 15: if (!(bpp_avail & BPP_15)) + if (!(bpp_avail & BPP_16)) { + printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp); + printf("vo_svga: Maybe you should try -bpp\n"); + return(1); + } else { + bpp = 16; + bpp_conv = 1; + } + break; + } } else { bpp = vo_dbpp; switch (bpp) { ! case 32: if (!(bpp_avail & BPP_32)) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp); return(1); } ! case 24: if (!(bpp_avail & BPP_24)) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp); return(1); } ! case 16: if (!(bpp_avail & BPP_16)) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp); return(1); } ! case 15: if (!(bpp_avail & BPP_15)) { ! printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp); return(1); } } } ! ! list = modelist; ! while ((list != NULL) && (!vid_mode)) { ! if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) { switch (bpp) { ! case 32: if (list->modeinfo.bytesperpixel == 4) ! vid_mode = list->modenum; ! case 24: if (list->modeinfo.bytesperpixel == 3) ! vid_mode = list->modenum; ! case 16: if (list->modeinfo.colors == 65536) ! vid_mode = list->modenum; ! case 15: if (list->modeinfo.colors == 32768) ! vid_mode = list->modenum; } ! } ! list = list->next; } ! vga_setlinearaddressing(); if (vga_setmode(vid_mode) == -1){ printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode); + uninit(); return(1); // error } if (gl_setcontextvga(vid_mode)){ printf("vo_svga: gl_setcontextvga(%d) failed.\n",vid_mode); + uninit(); return(1); // error } *************** *** 160,163 **** --- 238,242 ---- if (gl_setcontextvgavirtual(vid_mode)){ printf("vo_svga: gl_setcontextvgavirtual(%d) failed.\n",vid_mode); + uninit(); return(1); // error } *************** *** 167,180 **** gl_clearscreen(0); orig_w = width; orig_h = height; if ((fullscreen & 0x04) && (WIDTH != orig_w)) { ! if (((orig_w*1.0) / orig_h) < (4.0/3)) { maxh = HEIGHT; scaling = maxh / (orig_h * 1.0); maxw = (uint32_t) (orig_w * scaling); scalebuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (!scalebuf) { ! printf("vo_svga: Not enough memory for buffering!"); uninit(); return (1); --- 246,267 ---- gl_clearscreen(0); + if (bpp_conv) + bppbuf = malloc(maxw * maxh * BYTESPERPIXEL); + if (bppbuf == NULL) { + printf("vo_svga: Not enough memory for buffering!\n"); + uninit(); + return (1); + } + orig_w = width; orig_h = height; if ((fullscreen & 0x04) && (WIDTH != orig_w)) { ! if (!widescreen) { maxh = HEIGHT; scaling = maxh / (orig_h * 1.0); maxw = (uint32_t) (orig_w * scaling); scalebuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (scalebuf == NULL) { ! printf("vo_svga: Not enough memory for buffering!\n"); uninit(); return (1); *************** *** 185,190 **** maxh = (uint32_t) (orig_h * scaling); scalebuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (!scalebuf) { ! printf("vo_svga: Not enough memory for buffering!"); uninit(); return (1); --- 272,277 ---- maxh = (uint32_t) (orig_h * scaling); scalebuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (scalebuf == NULL) { ! printf("vo_svga: Not enough memory for buffering!\n"); uninit(); return (1); *************** *** 201,206 **** yuv2rgb_init(bpp, MODE_RGB); yuvbuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (!yuvbuf) { ! printf("vo_svga: Not enough memory for buffering!"); uninit(); return (1); --- 288,293 ---- yuv2rgb_init(bpp, MODE_RGB); yuvbuf = malloc(maxw * maxh * BYTESPERPIXEL); ! if (yuvbuf == NULL) { ! printf("vo_svga: Not enough memory for buffering!\n"); uninit(); return (1); *************** *** 218,233 **** uint8_t res = 0; ! if (!checked) ! checksupportedmodes(); // Looking for available video modes switch (format) { case IMGFMT_RGB32: case IMGFMT_BGR|32: { ! return (vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32]); } case IMGFMT_RGB24: case IMGFMT_BGR|24: { ! res = vid_modes[_640x480x16M] | vid_modes[_800x600x16M] | vid_modes[_1024x768x16M]; if (!res) { ! res = vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32]; bpp_conv = 1; } --- 305,322 ---- uint8_t res = 0; ! if (!checked) { ! if (checksupportedmodes()) // Looking for available video modes ! return(0); ! } switch (format) { case IMGFMT_RGB32: case IMGFMT_BGR|32: { ! return ((bpp_avail & BPP_32) ? 1 : 0); } case IMGFMT_RGB24: case IMGFMT_BGR|24: { ! res = (bpp_avail & BPP_24) ? 1 : 0; if (!res) { ! res = (bpp_avail & BPP_32) ? 1 : 0; bpp_conv = 1; } *************** *** 236,246 **** case IMGFMT_RGB16: case IMGFMT_BGR|16: { ! return (vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K]); } case IMGFMT_RGB15: case IMGFMT_BGR|15: { ! res = vid_modes[_640x480x32K] | vid_modes[_800x600x32K] | vid_modes[_1024x768x32K]; if (!res) { ! res = vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K]; bpp_conv = 1; } --- 325,335 ---- case IMGFMT_RGB16: case IMGFMT_BGR|16: { ! return ((bpp_avail & BPP_16) ? 1 : 0); } case IMGFMT_RGB15: case IMGFMT_BGR|15: { ! res = (bpp_avail & BPP_15) ? 1 : 0; if (!res) { ! res = (bpp_avail & BPP_16) ? 1 : 0; bpp_conv = 1; } *************** *** 279,283 **** src[0] = yuvbuf; } ! if (scalebuf) { gl_scalebox(orig_w, orig_h, src[0], maxw, maxh, scalebuf); src[0] = scalebuf; --- 368,372 ---- src[0] = yuvbuf; } ! if (scalebuf != NULL) { gl_scalebox(orig_w, orig_h, src[0], maxw, maxh, scalebuf); src[0] = scalebuf; *************** *** 325,329 **** sh = (uint32_t) (h * scaling); yuv2rgb(yuvbuf, image[0], image[1], image[2], w, h, orig_w * BYTESPERPIXEL, stride[0], stride[1]); ! if (scalebuf) { gl_scalebox(w, h, yuvbuf, sw, sh, scalebuf); src = scalebuf; --- 414,418 ---- sh = (uint32_t) (h * scaling); yuv2rgb(yuvbuf, image[0], image[1], image[2], w, h, orig_w * BYTESPERPIXEL, stride[0], stride[1]); ! if (scalebuf != NULL) { gl_scalebox(w, h, yuvbuf, sw, sh, scalebuf); src = scalebuf; *************** *** 348,360 **** static void uninit(void) { gl_freecontext(screen); gl_freecontext(virt); vga_setmode(TEXT); ! if (bppbuf) free(bppbuf); ! if (scalebuf) free(scalebuf); ! if (yuvbuf) free(yuvbuf); } --- 437,460 ---- static void uninit(void) { + vga_modelist_t *list = modelist; + gl_freecontext(screen); gl_freecontext(virt); vga_setmode(TEXT); ! if (bppbuf != NULL) free(bppbuf); ! if (scalebuf != NULL) free(scalebuf); ! if (yuvbuf != NULL) free(yuvbuf); + if (modelist != NULL) { + while (modelist->next != NULL) { + list = modelist; + while (list->next != NULL) + list = list->next; + free(list); + } + free(modelist); + } } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS VIDEOCARDS,1.6,1.7
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv21017/DOCS Modified Files: VIDEOCARDS Log Message: typo fixed Index: VIDEOCARDS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/VIDEOCARDS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** VIDEOCARDS 2001/04/15 11:48:21 1.6 --- VIDEOCARDS 2001/04/15 19:29:49 1.7 *************** *** 158,162 **** (Documentation/fb/*) ! ! ... but don't your card doesn't support VBE 2.0 standard (older ISA/PCI cards, such as S3 Trio64) : Well, VESAfb is still available, but you'll have to load SciTech Display --- 158,162 ---- (Documentation/fb/*) ! ! ... but your card doesn't support VBE 2.0 standard (older ISA/PCI cards, such as S3 Trio64) : Well, VESAfb is still available, but you'll have to load SciTech Display _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main cfg-mplayer.h,1.20,1.21
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv20658 Modified Files: cfg-mplayer.h Log Message: last fix, hopefully ;( Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** cfg-mplayer.h 2001/04/15 18:35:16 1.20 --- cfg-mplayer.h 2001/04/15 19:26:33 1.21 *************** *** 23,27 **** {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32}, #endif {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, --- 23,27 ---- {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! // {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32}, #endif {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS/Spanish CODECS,1.10,1.11 LIRC,1.1,1.2 SOUNDCARDS,1.9,1.10 VIDEOCARDS,1.5,1.6 example.conf,1.7,1.8
by TeLeNiEkO 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main/DOCS/Spanish In directory usw-pr-cvs1:/tmp/cvs-serv20574 Modified Files: CODECS LIRC SOUNDCARDS VIDEOCARDS example.conf Log Message: wOw all done! Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/CODECS,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** CODECS 2001/04/12 22:26:44 1.10 --- CODECS 2001/04/15 19:25:53 1.11 *************** *** 86,90 **** Codecs nativos integrados: ! - PCM descomprimido (0) - MPEG layer 2 y 3: (0x50, 0x55) mp3lib, basado en mpg123 (aveces da violacion de segmento, usa ACM entonces, mira abajo) --- 86,91 ---- Codecs nativos integrados: ! - PCM descomprimido (0x1) ! - DVD PCM descomprimido: (0x10001) - MPEG layer 2 y 3: (0x50, 0x55) mp3lib, basado en mpg123 (aveces da violacion de segmento, usa ACM entonces, mira abajo) Index: LIRC =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/LIRC,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** LIRC 2001/03/18 00:08:05 1.1 --- LIRC 2001/04/15 19:25:53 1.2 *************** *** 30,33 **** --- 30,37 ---- FWD - adelante 10 segundos FFWD - adelante 1 minuto + INCVOL - Sube el volumen un uno por ciento + DECVOL - Baja el volumen un uno por ciento + MASTER - Usa el canal 'master' del mezclador + PCM - Usa el canal 'pcm' del mezclador No te olvides de activar la opcion de 'repeat' (repeticion) para RWND/FWD en tu .lircrc. Index: SOUNDCARDS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/SOUNDCARDS,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** SOUNDCARDS 2001/04/04 20:40:13 1.9 --- SOUNDCARDS 2001/04/15 19:25:53 1.10 *************** *** 8,15 **** Aureal Vortex 2: (Pontscho) En config.h, cambia #define HAVE_AUDIO_SELECT por ! #undef HAVE_AUDIO_SELECT ! OSS : Con archivos MPEG: Los valores por defecto: Ok ! Con archivos AVI : -delay -0.5 ! ALSA : lo mismo --- 8,15 ---- Aureal Vortex 2: (Pontscho) En config.h, cambia #define HAVE_AUDIO_SELECT por ! #undef HAVE_AUDIO_SELECT o ejecuta: ! ./configure con la opcion --disable-select ! ! ALSA con GUS PnP: mira Aulear Vortex 2 Index: VIDEOCARDS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/VIDEOCARDS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** VIDEOCARDS 2001/04/02 16:57:45 1.5 --- VIDEOCARDS 2001/04/15 19:25:53 1.6 *************** *** 14,19 **** IV. DGA - Direct Draphic Access. (Acceso Directo a Graficos) Sin yuv ni escalado, pero mas rapido que X11 ! Ahora veamos los detalles: I. Bajo XFree86 v4.0.x, usando la extension XVideo: --- 14,20 ---- IV. DGA - Direct Draphic Access. (Acceso Directo a Graficos) Sin yuv ni escalado, pero mas rapido que X11 + V. Realmente no es aceleracion, pero... ! Ahora veamos los en detalle: I. Bajo XFree86 v4.0.x, usando la extension XVideo: *************** *** 101,106 **** 1. Asegurate de que las X cargan la extension DGA. (II) Loading extension XFree86-DGA 2. El dispositivo DGA es detectado en ./configure, o puedes forzarlo con: --enable-dga ! 3. Asegurate de usar un modo a 24/32bpp, ya que no hay ningun conversor, aun :( 4. Instala MPlayer SUID root. (Mira la FAQ para saber como hacerlo, y leete el aviso!) --- 102,111 ---- 1. Asegurate de que las X cargan la extension DGA. (II) Loading extension XFree86-DGA + (como puedes ver, XFree86 4.0.x esta MUY RECOMENDADO!) 2. El dispositivo DGA es detectado en ./configure, o puedes forzarlo con: --enable-dga ! 3. Si el driver no puede cambiar a una resolucion menor, prueba con la opcion -vm ! (solo con X 3.0.x), -fs, -bpp, -zoom para encontrar un modo de video en el que ! quepa la pelicula. Por ahora no hay ningun conversor.. :( ! 4. Instala MPlayer SUID root. (Mira la FAQ para saber como hacerlo, y leete el aviso!) *************** *** 110,113 **** --- 115,140 ---- a pantalla completa de mpeg (usando escalado YUV->RGB por software) mplayer -vo fsdga ... + + V. No es realmente aceleracion, pero... + + a, Si no tienes X... + ...usa la salida SVGAlib! Asegurate de no usar la opcion -fs, ya que esta + activa el uso del escalado por software, y esto es LENTOOO ahora, a no ser + que tengas una CPU realmente rapida (y/o MTRR?). :( + + Obviamente tendras que instalar svgalib y su paquete de desarroyo para + que MPlayer pueda compilar su driver SVGAlib (autodetecado, pero se puede + forzar), y no olvides editar /etc/vga/libvga.conf para tu tarjeta & monitor. + + b, Si quieres usar framebuffer... + ... Usa la opcion --enable-fbdev de ./configure y la salida FBdev sera compilada + (no olvides hacer 'make distclean' primero!). Otro 'no olvides': lee la documentacion + del framebuffer de las fuentes del kernel (Documentation/fb/*) ! + + ... pero si tu tarjeta no soporta el estandar VBE 2.0 (tarjetas ISA/PCI viejas, + como la S3 Trio64) : + Bien, VESAfb todavia esta disponible, pero necesitas cargar el "SciTech + Display Doctor" (formalmente UniVBE) antes de arrancar Linux. Usa un disco + de arranque de DOS o alguna otra cosa. Y no olvides registar tu UniVBE ;)) Gabucino & A'rpi Index: example.conf =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/example.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** example.conf 2001/04/12 22:26:44 1.7 --- example.conf 2001/04/15 19:25:53 1.8 *************** *** 15,20 **** # la linea de comandos para opciones. ! fs=yes # Activa el escalado por hardware ! # (Si esta disponible) vm=no # Intenta cambiar a un videomode mas pequeño --- 15,21 ---- # la linea de comandos para opciones. ! fs=yes # Ensancha la ventana de la pelicula al tamaño ! # de tu escritorio. (tambien para SVGAlib!) ! # Usado por los drivers: todos vm=no # Intenta cambiar a un videomode mas pequeño *************** *** 22,27 **** # Usado por: dga, x11 (, sdl?) ! zoom = yes # Activa el escalado por software ! # (Cuando esta disponible) ## ## Hay multiples idiomas disponibles :) --- 23,36 ---- # Usado por: dga, x11 (, sdl?) ! #bpp=0 # Fuerza el cambio de la profundidad de color. ! # Valores validos: 0, 15, 16, 24, 32 ! # Usado por los driver: fbdev, dga2, svga ! ! zoom=no # Activa el escalado por software (requeiere mucha CPU!) ! # Usado por los drivers: svga, (sdl - porque no?) ! ! #x=TODO ! #y=TODO ! ## ## Hay multiples idiomas disponibles :) _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main Makefile,1.15,1.16
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv20392 Modified Files: Makefile Log Message: poncso suxx meg mindig :) Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** Makefile 2001/04/15 18:35:16 1.15 --- Makefile 2001/04/15 19:24:30 1.16 *************** *** 66,70 **** $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a ! @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow drivers drivers/syncfb ; do $(MAKE) -C $$a; done $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++ --- 66,70 ---- $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a ! @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow ; do $(MAKE) -C $$a; done $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main mplayer.c,1.66,1.67
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv19448 Modified Files: mplayer.c Log Message: now it'll work ;) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** mplayer.c 2001/04/15 19:13:38 1.66 --- mplayer.c 2001/04/15 19:17:10 1.67 *************** *** 1580,1583 **** --- 1580,1595 ---- osd_level=(osd_level+1)%3; break; + case '*': + mixer_incvolume(); + break; + case '/': + mixer_decvolume(); + break; + case 'm': + mixer_usemaster=1; + break; + case 'c': + mixer_usemaster=0; + break; } if(rel_seek_secs) _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main mplayer.c,1.65,1.66
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv19043 Modified Files: mplayer.c Log Message: fixed mplayer.c Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** mplayer.c 2001/04/15 18:35:17 1.65 --- mplayer.c 2001/04/15 19:13:38 1.66 *************** *** 33,36 **** --- 33,37 ---- #include "cfgparser.h" + #include "mixer.h" #include "cfg-mplayer-def.h" *************** *** 89,93 **** //**************************************************************************// [...1164 lines suppressed...] if (d_video->pts < d_audio->pts){ ! } else { while(d_video->pts > d_audio->pts){ ! switch(sh_audio->codec->driver){ case 1: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame case 3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame *************** *** 1854,1858 **** // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; // vo_osd_text=osd_text_buffer; ! // find sub if(subtitles){ --- 1871,1875 ---- // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; // vo_osd_text=osd_text_buffer; ! // find sub if(subtitles){ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main mixer.c,NONE,1.1 mixer.h,NONE,1.1
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv9590 Added Files: mixer.c mixer.h Log Message: ups, I missed'em.. --- NEW FILE --- #include <string.h> #include <sys/ioctl.h> #include <sys/soundcard.h> #include <fcntl.h> #include <stdio.h> #include "mixer.h" #define DEV_MIXER "/dev/mixer" char * mixer_device=NULL; char * devname=NULL; int mixer_usemaster=0; void mixer_getvolume( int *l,int *r ) { int fd,v,cmd,devs; if ( !mixer_device ) devname=strdup( DEV_MIXER ); else devname=strdup( mixer_device ); fd=open( devname,O_RDONLY ); free( devname ); if ( fd != -1 ) { ioctl( fd,SOUND_MIXER_READ_DEVMASK,&devs ); if ( ( devs & SOUND_MASK_PCM ) && ( mixer_usemaster==0 ) ) cmd=SOUND_MIXER_READ_PCM; else if ( ( devs & SOUND_MASK_VOLUME ) && ( mixer_usemaster==1 ) ) cmd=SOUND_MIXER_READ_VOLUME; else { close( fd ); return; } ioctl( fd,cmd,&v ); *r=( v & 0xFF00 ) >> 8; *l=( v & 0x00FF ); close( fd ); } } void mixer_setvolume( int l,int r ) { int fd,v,cmd,devs; if ( !mixer_device ) devname=strdup( DEV_MIXER ); else devname=strdup( mixer_device ); fd=open( devname,O_RDONLY ); free( devname ); if ( fd != -1 ) { ioctl( fd,SOUND_MIXER_READ_DEVMASK,&devs ); if ( ( devs & SOUND_MASK_PCM ) && ( mixer_usemaster==0 ) ) cmd=SOUND_MIXER_WRITE_PCM; else if ( ( devs & SOUND_MASK_VOLUME ) && ( mixer_usemaster==1 ) ) cmd=SOUND_MIXER_WRITE_VOLUME; else { close( fd ); return; } v=( r << 8 ) | l; ioctl( fd,cmd,&v ); close( fd ); } } int mixer_l=0; int mixer_r=0; void mixer_incvolume( void ) { fprintf( stderr,"[mixer] inc.\n" ); mixer_getvolume( &mixer_l,&mixer_r ); if ( mixer_l < 100 ) mixer_l++; if ( mixer_r < 100 ) mixer_r++; mixer_setvolume( mixer_l,mixer_r ); } void mixer_decvolume( void ) { fprintf( stderr,"[mixer] dec.\n" ); mixer_getvolume( &mixer_l,&mixer_r ); if ( mixer_l > 0 ) mixer_l--; if ( mixer_r > 0 ) mixer_r--; mixer_setvolume( mixer_l,mixer_r ); } int mixer_getbothvolume( void ) { mixer_getvolume( &mixer_l,&mixer_r ); return ( mixer_l + mixer_r ) / 2; } --- NEW FILE --- #ifndef __MPLAYER_MIXER #define __MPLAYER_MIXER #define DEV_MIXER "/dev/mixer" extern int mixer_usemaster; extern char * mixer_device; extern void mixer_getvolume( int *l,int *r ); extern void mixer_setvolume( int l,int r ); extern void mixer_incvolume( void ); extern void mixer_decvolume( void ); extern int mixer_getbothvolume( void ); //extern void mixer_setbothvolume( int v ); #define mixer_setbothvolume( v ) mixer_setvolume( v,v ) #endif _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main Makefile,1.14,1.15 cfg-mplayer.h,1.19,1.20 configure,1.20,1.21 help_mp.h,1.6,1.7 lirc_mp.c,1.1.1.1,1.2 mplayer.c,1.64,1.65
by Berczi Gabor 15 Apr '01

15 Apr '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv9181 Modified Files: Makefile cfg-mplayer.h configure help_mp.h lirc_mp.c mplayer.c Log Message: Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;) Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** Makefile 2001/04/14 22:37:35 1.14 --- Makefile 2001/04/15 18:35:16 1.15 *************** *** 23,28 **** BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c ! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 --- 23,28 ---- BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c ! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o mixer.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 *************** *** 33,37 **** # .PHONY: all clean ! all: version.h $(PRG) $(PRG_CFG) # $(PRG_AVIP) --- 33,37 ---- # .PHONY: all clean ! all: $(PRG) $(PRG_CFG) # $(PRG_AVIP) *************** *** 66,69 **** --- 66,70 ---- $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a + @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow drivers drivers/syncfb ; do $(MAKE) -C $$a; done $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++ *************** *** 77,81 **** $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) ! $(PRG_CFG): .depend codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING --- 78,82 ---- $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) ! $(PRG_CFG): codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING *************** *** 99,112 **** makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null - # rebuild at every config.h/config.mak change: - version.h: config.h config.mak Makefile - $(MAKE) distclean - ./version.sh - - # rebuild at every CVS update: - ifneq ($(wildcard CVS/Entries),) - version.h: CVS/Entries - endif - # # include dependency files if they exist --- 100,103 ---- *************** *** 115,117 **** include .depend endif - --- 106,107 ---- Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** cfg-mplayer.h 2001/04/14 21:23:29 1.19 --- cfg-mplayer.h 2001/04/15 18:35:16 1.20 *************** *** 7,83 **** extern char *fb_mode_cfgfile; extern char *fb_mode_name; ! extern char *monitor_hfreq_str; ! extern char *monitor_vfreq_str; ! extern char *monitor_dotclock_str; #endif struct config conf[]={ ! /* name, pointer, type, flags, min, max */ ! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ ! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, ! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, #ifdef HAVE_FBDEV ! {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0}, ! {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0}, #endif ! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0}, ! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0}, ! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0}, ! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0}, ! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0}, ! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0}, ! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0}, ! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0}, ! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0}, ! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10}, ! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, ! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, ! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, ! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0}, ! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63}, ! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, ! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0}, ! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0}, {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1}, {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0}, ! {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, ! ! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0}, ! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1}, ! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100}, ! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0}, ! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {NULL, NULL, 0, 0, 0, 0} }; --- 7,81 ---- extern char *fb_mode_cfgfile; extern char *fb_mode_name; ! extern int fb_mode_depth; #endif struct config conf[]={ ! /* name, pointer, type, flags, min, max */ ! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ ! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, ! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, ! {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0}, ! {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, #ifdef HAVE_FBDEV ! {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0}, ! {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32}, #endif ! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, ! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0}, ! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0}, ! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0}, ! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0}, ! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0}, ! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0}, ! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0}, ! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0}, ! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1}, ! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0}, ! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256}, ! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0}, ! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0}, ! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10}, ! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, ! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, ! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, ! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0}, ! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63}, ! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, ! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, ! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0}, ! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1}, ! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0}, {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1}, {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0}, ! {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, ! ! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0}, ! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1}, ! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100}, ! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0}, ! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, ! {NULL, NULL, 0, 0, 0, 0} }; Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** configure 2001/04/14 21:16:23 1.20 --- configure 2001/04/15 18:35:16 1.21 *************** *** 7,10 **** --- 7,14 ---- # Changes in reversed order: # + # 2001/04/15 by Pontscho + # - added --disable-select option + # - added X11DIR variable in config.mak and fix syncfb Makefile -L/usr/X11/lib bug + # # 2001/03/24 by Mike Graffam: # - added autodetect code for XF86VidMode, along with explicit --enable-vm *************** *** 90,94 **** --enable-termcap use termcap database for key codes --enable-xmmp use XMMP audio drivers ! --enable-lirc enable LIRC (remote control) support --with-x11libdir=DIR X library files are in DIR --- 94,101 ---- --enable-termcap use termcap database for key codes --enable-xmmp use XMMP audio drivers ! --enable-lirc enable LIRC ( remote control ) support ! ! --disable-select disable audio select() support ( for example required this ! option ALSA or Vortex2 driver ) --with-x11libdir=DIR X library files are in DIR *************** *** 131,145 **** _cc=gcc - _x11=auto - _x11libdir= - if [ -e /usr/X11R6 ]; then - _x11libdir=-L/usr/X11R6/lib - else - if [ -e /usr/X11 ]; then - _x11libdir=-L/usr/X11/lib - fi - fi - for ac_option do --- 138,142 ---- *************** *** 148,160 **** _cc=`echo $ac_option | cut -d '=' -f 2` ;; - --with-x11libdir=*) - _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` - ;; - --enable-x11) - _x11=yes - ;; - --disable-x11) - _x11=no - ;; esac done --- 145,148 ---- *************** *** 183,186 **** --- 171,175 ---- _xv=no _vm=no + _x11=no _3dfx=no _syncfb=no *************** *** 191,195 **** _dga2=no _svga=no ! _fbdev=yes _lirc=no _xdpms=no --- 180,184 ---- _dga2=no _svga=no ! _fbdev=no _lirc=no _xdpms=no *************** *** 200,205 **** _gllib= _sdllib= - _xvlib= _x11lib= for i in `echo $pparam`; do --- 189,197 ---- _gllib= _sdllib= _x11lib= + _xvlib= + _xlibdir= + + _select='#define HAVE_AUDIO_SELECT' for i in `echo $pparam`; do *************** *** 238,241 **** --- 230,240 ---- done + if [ -e /usr/X11R6 ]; then + _x11libdir=-L/usr/X11R6/lib + else + if [ -e /usr/X11 ]; then + _x11libdir=-L/usr/X11/lib + fi + fi _win32libdirnotify=no *************** *** 377,383 **** ! $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes ! $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \ { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } --- 376,388 ---- ! # check GL & X11 & Xext & Xv & SDL & termcap libs ! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes ! $_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes ! $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes ! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \ { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } *************** *** 385,389 **** # this is very buggy & experimental code, use it only if you really need it!! _have_sdl=no ! $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes _termcap=no --- 390,394 ---- # this is very buggy & experimental code, use it only if you really need it!! _have_sdl=no ! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes _termcap=no *************** *** 392,418 **** _binutils=no as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes - - # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) -------------- - - if [ $_x11 = auto ]; then - _x11=no - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes - fi - - if [ $_x11 = yes ]; then - - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes - $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes - - $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes - - cat > $TMPC << EOF - #include <GL/gl.h> - int main( void ) { return 0; } - EOF - $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \ - { _gl=no; echo "GL includes not found!";} ! $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes cat > $TMPC << EOF --- 397,402 ---- _binutils=no as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes ! # LGB: Check DGA cat > $TMPC << EOF *************** *** 423,426 **** --- 407,411 ---- EOF + _dga=no $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes # Note: the -lXxf86vm library is the VideoMode extension and though it's *************** *** 430,433 **** --- 415,420 ---- # If you run into problems, remove '-lXxf86vm'. + # --- + # Check if DGA is 2.0 or greater cat > $TMPC << EOF *************** *** 441,448 **** $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes - fi rm -f $TMPC $TMPO # --- --- 428,449 ---- $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes + cat > $TMPC << EOF + #include <GL/gl.h> + int main( void ) { return 0; } + EOF + + $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \ + { _gl=no; echo "GL includes not found!";} + rm -f $TMPC $TMPO + + if [ $_x11 = 'yes' ]; then + if [ $_mga = 'yes' ]; then + _xmga=yes + fi + fi + # --- *************** *** 494,497 **** --- 495,501 ---- _vm=yes ;; + --enable-x11) + _x11=yes + ;; --enable-3dfx) _3dfx=yes *************** *** 515,518 **** --- 519,525 ---- _lirc=yes ;; + --enable-select) + _select='#define HAVE_AUDIO_SELECT' + ;; --disable-sse) _sse=no *************** *** 546,549 **** --- 553,559 ---- _vm=no ;; + --disable-x11) + _x11=no + ;; --disable-mlib) _mlib=no *************** *** 564,567 **** --- 574,583 ---- _termcap=no ;; + --disable-select) + _select='#undef HAVE_AUDIO_SELECT' + ;; + --with-x11libdir=*) + _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` + ;; --with-win32libdir=*) _win32libdir=`echo $ac_option | cut -d '=' -f 2` *************** *** 574,579 **** _y=`echo $ac_option | cut -d '=' -f 2` ;; - --with-x11libdir=*) - ;; --cc=*) ;; --- 590,593 ---- *************** *** 581,590 **** done - if [ $_x11 = 'yes' ]; then - if [ $_mga = 'yes' ]; then - _xmga=yes - fi - fi - # to screen. echo "Using C compiler: $_cc" --- 595,598 ---- *************** *** 676,683 **** AR=ar CC=$_cc # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs --- 684,693 ---- AR=ar CC=$_cc + X11DIR=$_x11libdir # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! # X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib ! X_LIBS=\$(X11DIR) $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs *************** *** 838,842 **** If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ ! #define HAVE_AUDIO_SELECT /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm) --- 848,852 ---- If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ ! $_select /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm) Index: help_mp.h =================================================================== RCS file: /cvsroot/mplayer/main/help_mp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** help_mp.h 2001/04/14 22:50:25 1.6 --- help_mp.h 2001/04/15 18:35:17 1.7 *************** *** 1,9 **** static char* banner_text= "\n\n" ! "MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi(a)thot.banki.hu>\n" "\n"; static char* help_text= ! "\nUsage: mplayer [options] [path/]name\n" "\n" " Options:\n" --- 1,9 ---- static char* banner_text= "\n\n" ! "MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi(a)esp-team.scene.hu>\n" "\n"; static char* help_text= ! "Usage: mplayer [options] [path/]name\n" "\n" " Options:\n" *************** *** 41,43 **** --- 41,45 ---- " + or - adjust audio delay by +/- 0.1 second\n" " o toggle OSD: none / seek / seek+timer\n" + " * or / increase or decrease volume\n" + " m or c use mixer master or pcm channel\n" "\n"; Index: lirc_mp.c =================================================================== RCS file: /cvsroot/mplayer/main/lirc_mp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** lirc_mp.c 2001/02/24 20:28:35 1.1.1.1 --- lirc_mp.c 2001/04/15 18:35:17 1.2 *************** *** 96,100 **** {"RWND" , KEY_LEFT}, {"FRWND" , KEY_DOWN}, ! {"PAUSE", 'p'} }; --- 96,104 ---- {"RWND" , KEY_LEFT}, {"FRWND" , KEY_DOWN}, ! {"PAUSE", 'p'}, ! {"INCVOL", '*'}, ! {"DECVOL", '/'}, ! {"MASTER", 'm'}, ! {"PCM", 'c'} }; Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -r1.64 -r1.65 *** mplayer.c 2001/04/15 14:46:07 1.64 --- mplayer.c 2001/04/15 18:35:17 1.65 *************** *** 89,93 **** //**************************************************************************// ! // .SUB //**************************************************************************// --- 89,93 ---- //**************************************************************************// ! // .SUB //**************************************************************************// [...1158 lines suppressed...] if (d_video->pts < d_audio->pts){ ! } else { while(d_video->pts > d_audio->pts){ ! switch(has_audio){ case 1: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame case 3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame *************** *** 1870,1874 **** // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; // vo_osd_text=osd_text_buffer; ! // find sub if(subtitles){ --- 1854,1858 ---- // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; // vo_osd_text=osd_text_buffer; ! // find sub if(subtitles){ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0