July 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS mplayer.1,1.197,1.198 documentation.html,1.277,1.278
by Diego Biurrun CVS 02 Aug '02

02 Aug '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv18727 Modified Files: mplayer.1 documentation.html Log Message: Documented -vop rectangle. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- mplayer.1 26 Jul 2002 03:28:07 -0000 1.197 +++ mplayer.1 30 Jul 2002 18:08:06 -0000 1.198 @@ -498,6 +498,7 @@ Available plugins are: crop[=w:h:x:y] cropping + rectangle[=w:h:x:y] shows cropping boundaries expand[=w:h:x:y:o] expanding and OSD flip vertical mirroring mirror horizontal mirroring Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- documentation.html 26 Jul 2002 03:24:24 -0000 1.277 +++ documentation.html 30 Jul 2002 18:08:06 -0000 1.278 @@ -217,6 +217,7 @@ <LI><A HREF="#2.6.13">2.6.13 Mirror</A></LI> <LI><A HREF="#2.6.14">2.6.14 DVBscale</A></LI> <LI><A HREF="#2.6.15">2.6.15 Cropdetect</A></LI> + <LI><A HREF="#2.6.16">2.6.16 Rectangle</A></LI> </UL> </LI> </UL> @@ -1271,6 +1272,19 @@ Usage: <CODE>  -vop cropdetect[=limit]</CODE> + + +<A NAME=2.6.16>2.6.16. Rectangle</A> + +Description: + +Draws a white rectangle of the requested width and height at the designated + coordinates over the image. Useful to get visual feedback for the parameters + of <CODE>-vop crop</CODE> before applying them. + +Usage: + +<CODE>  -vop rectangle[=width:height:x:y]</CODE> <A NAME=3>3. Usage</A>

3 2

CVS: main/libmpcodecs vf_lavcdeint.c,1.1,1.2
by Arpi of Ize 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv18199 Modified Files: vf_lavcdeint.c Log Message: - yuv422 disabled (no IMGFMT for _planar_ 422) - direct rendering support (use get_image to allocate the image buffer) Index: vf_lavcdeint.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavcdeint.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vf_lavcdeint.c 31 Jul 2002 19:50:42 -0000 1.1 +++ vf_lavcdeint.c 31 Jul 2002 20:18:44 -0000 1.2 @@ -25,9 +25,6 @@ struct vf_priv_s { - AVPicture pic; - UINT8 *outbuf; - int outbuf_size; int width, height; int pix_fmt; }; @@ -61,6 +58,7 @@ return PIX_FMT_YUV420P; break; +#if 0 /* 4:2:2 */ case IMGFMT_UYVY: case IMGFMT_UYNV: @@ -73,6 +71,7 @@ case IMGFMT_V655: return PIX_FMT_YUV422P; break; +#endif /* Are there any _planar_ YUV 4:4:4 formats? */ @@ -102,37 +101,18 @@ priv->width = width; priv->height = height; - - if(priv->outbuf) - av_free(priv->outbuf); - - priv->outbuf_size = - avpicture_get_size(priv->pix_fmt, priv->width, priv->height); - - priv->outbuf = av_malloc(priv->outbuf_size); - avpicture_fill(&priv->pic, priv->outbuf, priv->pix_fmt, - priv->width, priv->height); - return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); } - -static void -uninit (struct vf_instance_s *vf) -{ - if(vf->priv->outbuf) - av_free(vf->priv->outbuf); -} - - static void put_image (struct vf_instance_s* vf, mp_image_t *mpi) { struct vf_priv_s *priv = vf->priv; mp_image_t* dmpi; + AVPicture pic; AVPicture lavc_picture; lavc_picture.data[0] = mpi->planes[0]; @@ -142,26 +122,23 @@ lavc_picture.linesize[1] = mpi->stride[1]; lavc_picture.linesize[2] = mpi->stride[2]; - dmpi = vf_get_image(vf->next, mpi->imgfmt, - MP_IMGTYPE_EXPORT, 0, - mpi->w, mpi->h); + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + priv->width, priv->height); - - if (avpicture_deinterlace(&priv->pic, &lavc_picture, + pic.data[0] = dmpi->planes[0]; + pic.data[1] = dmpi->planes[1]; + pic.data[2] = dmpi->planes[2]; + pic.linesize[0] = dmpi->stride[0]; + pic.linesize[1] = dmpi->stride[1]; + pic.linesize[2] = dmpi->stride[2]; + + if (avpicture_deinterlace(&pic, &lavc_picture, priv->pix_fmt, priv->width, priv->height) < 0) { /* This should not happen -- see config() */ return; } - - - dmpi->planes[0] = priv->pic.data[0]; - dmpi->planes[1] = priv->pic.data[1]; - dmpi->planes[2] = priv->pic.data[2]; - dmpi->stride[0] = priv->pic.linesize[0]; - dmpi->stride[1] = priv->pic.linesize[1]; - dmpi->stride[2] = priv->pic.linesize[2]; vf_next_put_image(vf, dmpi); } @@ -186,7 +163,6 @@ vf->config = config; vf->put_image = put_image; vf->query_format = query_format; - vf->uninit = uninit; vf->priv = malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s));

2 1

CVS: main/libmpcodecs vf_lavcdeint.c,NONE,1.1 Makefile,1.51,1.52 vf.c,1.39,1.40
by Arpi of Ize 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv5495 Modified Files: Makefile vf.c Added Files: vf_lavcdeint.c Log Message: new filter to use libavcodec's deinterlacer patch by Joe Rabinoff <rabinoff(a)fas.harvard.edu> (TODO: DOCS, DR1) --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include "../config.h" #include "../mp_msg.h" #include "../help_mp.h" #ifdef USE_LIBAVCODEC #include "img_format.h" #include "mp_image.h" #include "vf.h" //#include "../libvo/fastmemcpy.h" #ifdef USE_LIBAVCODEC_SO #include <libffmpeg/avcodec.h> #else #include "libavcodec/avcodec.h" #endif extern int avcodec_inited; struct vf_priv_s { AVPicture pic; UINT8 *outbuf; int outbuf_size; int width, height; int pix_fmt; }; #define lavc_venc_context (vf->priv->context) /* Support for avcodec's built-in deinterlacer. * Based on vf_lavc.c */ //===========================================================================// /* Convert mplayer's IMGFMT_* to avcodec's PIX_FMT_* for the supported * IMGFMT's, and return -1 if the deinterlacer doesn't support * that format (-1 because 0 is a valid PIX_FMT). */ /* The deinterlacer supports planer 4:2:0, 4:2:2, and 4:4:4 YUV */ static int imgfmt_to_pixfmt (int imgfmt) { switch(imgfmt) { /* I hope I got all the supported formats */ /* 4:2:0 */ case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: return PIX_FMT_YUV420P; break; /* 4:2:2 */ case IMGFMT_UYVY: case IMGFMT_UYNV: case IMGFMT_Y422: case IMGFMT_YUY2: case IMGFMT_YUNV: case IMGFMT_YVYU: case IMGFMT_Y42T: case IMGFMT_V422: case IMGFMT_V655: return PIX_FMT_YUV422P; break; /* Are there any _planar_ YUV 4:4:4 formats? */ default: return -1; } } static int config (struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { struct vf_priv_s *priv = vf->priv; priv->pix_fmt = imgfmt_to_pixfmt(outfmt); if(priv->pix_fmt == -1) return 0; /* The deinterlacer will fail if this is false */ if ((width & 1) != 0 || (height & 3) != 0) return 0; /* If we get here, the deinterlacer is guaranteed not to fail */ priv->width = width; priv->height = height; if(priv->outbuf) av_free(priv->outbuf); priv->outbuf_size = avpicture_get_size(priv->pix_fmt, priv->width, priv->height); priv->outbuf = av_malloc(priv->outbuf_size); avpicture_fill(&priv->pic, priv->outbuf, priv->pix_fmt, priv->width, priv->height); return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); } static void uninit (struct vf_instance_s *vf) { if(vf->priv->outbuf) av_free(vf->priv->outbuf); } static void put_image (struct vf_instance_s* vf, mp_image_t *mpi) { struct vf_priv_s *priv = vf->priv; mp_image_t* dmpi; AVPicture lavc_picture; lavc_picture.data[0] = mpi->planes[0]; lavc_picture.data[1] = mpi->planes[1]; lavc_picture.data[2] = mpi->planes[2]; lavc_picture.linesize[0] = mpi->stride[0]; lavc_picture.linesize[1] = mpi->stride[1]; lavc_picture.linesize[2] = mpi->stride[2]; dmpi = vf_get_image(vf->next, mpi->imgfmt, MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h); if (avpicture_deinterlace(&priv->pic, &lavc_picture, priv->pix_fmt, priv->width, priv->height) < 0) { /* This should not happen -- see config() */ return; } dmpi->planes[0] = priv->pic.data[0]; dmpi->planes[1] = priv->pic.data[1]; dmpi->planes[2] = priv->pic.data[2]; dmpi->stride[0] = priv->pic.linesize[0]; dmpi->stride[1] = priv->pic.linesize[1]; dmpi->stride[2] = priv->pic.linesize[2]; vf_next_put_image(vf, dmpi); } static int query_format (struct vf_instance_s* vf, unsigned int fmt) { if(imgfmt_to_pixfmt(fmt) == -1) return 0; return vf_next_query_format(vf,fmt); } static int open (vf_instance_t *vf, char* args) { /* We don't have any args */ (void) args; vf->config = config; vf->put_image = put_image; vf->query_format = query_format; vf->uninit = uninit; vf->priv = malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); /* This may not technically be necessary just for a deinterlace, * but it seems like a good idea. */ if(!avcodec_inited) { avcodec_init(); avcodec_register_all(); avcodec_inited=1; } return 1; } vf_info_t vf_info_lavcdeint = { "libavcodec's deinterlacing filter", "lavcdeint", "Joe Rabinoff", "libavcodec's internal deinterlacer, in case you don't like " "the builtin ones (invoked with -pp or -npp)", open }; //===========================================================================// #endif /* USE_LIBAVCODEC */ Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- Makefile 27 Jul 2002 11:40:15 -0000 1.51 +++ Makefile 31 Jul 2002 19:50:42 -0000 1.52 @@ -6,7 +6,7 @@ AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_vorbis.c ad_libmad.c ad_real.c VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_real.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c vd_svq1.c vd_xvid.c -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- vf.c 27 Jul 2002 11:40:15 -0000 1.39 +++ vf.c 31 Jul 2002 19:50:42 -0000 1.40 @@ -35,6 +35,7 @@ extern vf_info_t vf_info_test; extern vf_info_t vf_info_noise; extern vf_info_t vf_info_yvu9; +extern vf_info_t vf_info_lavcdeint; char** vo_plugin_args=(char**) NULL; @@ -59,6 +60,7 @@ &vf_info_palette, #ifdef USE_LIBAVCODEC &vf_info_lavc, + &vf_info_lavcdeint, #endif &vf_info_dvbscale, &vf_info_cropdetect,

1 0

CVS: main/libvo vo_x11.c,1.113,1.114
by Arpi of Ize 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv2312 Modified Files: vo_x11.c Log Message: initial window size (-xy) fixed - patch by Kazunori Ueno <jagarl(a)creator.club.ne.jp> Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- vo_x11.c 11 Jul 2002 16:14:55 -0000 1.113 +++ vo_x11.c 31 Jul 2002 19:40:33 -0000 1.114 @@ -259,7 +259,7 @@ srcW= width; srcH= height; vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; - vo_dwidth=width; vo_dheight=height; + vo_dwidth=d_width; vo_dheight=d_height; if( flags&0x03 ) fullscreen = 1; if( flags&0x02 ) vm = 1;

1 0

CVS: main/Gui/mplayer play.c,1.68,1.69
by Zoltan Ponekker 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv24233/mplayer Modified Files: play.c Log Message: upsz 2 Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- play.c 25 Jul 2002 20:26:34 -0000 1.68 +++ play.c 31 Jul 2002 13:26:46 -0000 1.69 @@ -97,8 +97,8 @@ guiSetDF( guiIntfStruct.Filename,next->path,next->name ); guiIntfStruct.StreamType=STREAMTYPE_FILE; guiIntfStruct.FilenameChanged=1; - if ( guiIntfStruct.AudioFile ) free( guiIntfStruct.AudioFile ); - guiIntfStruct.AudioFile=NULL; + gfree( (void **)&guiIntfStruct.AudioFile ); + gfree( (void **)&guiIntfStruct.Subtitlename ); } else {

1 0

CVS: main/Gui interface.c,1.27,1.28
by Zoltan Ponekker 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/Gui In directory mail:/var/tmp.root/cvs-serv24233 Modified Files: interface.c Log Message: upsz 2 Index: interface.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- interface.c 30 Jul 2002 13:38:35 -0000 1.27 +++ interface.c 31 Jul 2002 13:26:38 -0000 1.28 @@ -84,7 +84,7 @@ gtkAOOSSDevice=strdup( PATH_DEV_DSP ); cfg_read(); appInit( (void*)mDisplay ); - if ( plCurrent ) mplSetFileName( plCurrent->path,plCurrent->name ); + if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name ); #if defined( USE_OSD ) || defined( USE_SUB ) guiLoadFont(); #endif @@ -315,7 +315,7 @@ #endif break; case guiSetDefaults: - if ( filename && gstrcmp( filename,guiIntfStruct.Filename ) ) + if ( filename && !guiIntfStruct.Filename ) { gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE; guiSetFilename( guiIntfStruct.Filename,filename );

1 0

CVS: main/DOCS/tech TODO,1.43,1.44
by Arpi of Ize 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv21740 Modified Files: TODO Log Message: updated - feel free to comment Index: TODO =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/TODO,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- TODO 12 May 2002 00:46:39 -0000 1.43 +++ TODO 30 Jul 2002 16:54:01 -0000 1.44 @@ -2,15 +2,28 @@ TODO: ===== -FOR THE PRE-RELEASE: -~~~~~~~~~~~~~~~~~~~~ -- finish mencoder -ovc vfw (bitrate setting, codec selection etc) -- codec priority option +FOR THE v0.90 RELEASE: +~~~~~~~~~~~~~~~~~~~~~~ +- use codec family names instead of IDs (-afm/-vfm changes) +- codec (vc/ac) priority option +- ao/vo priority option + +demuxer: +- fix .asf demuxer bugs - DONE? +- fix buggy .rm files (broken rv20/30 frames) - Florian? +- add+test non-cook realaudio codecs - samples? +- fix .mp4 demuxer bugs - Atmos? (sig11, bad AAC audio) +FOR THE v1.00 RELEASE: +~~~~~~~~~~~~~~~~~~~~~~ -FOR THE RELEASE: -~~~~~~~~~~~~~~~~ -- mencoder: migrate to muxer layer +- audio filter layer +- new demuxer layer - at least modularized... +- display OSD and subtitles using DVB card's OSD + +mpg demuxer: +- implement mpeg-TS demuxer +- implement common mpeg 1/2/4 es/ps/pes/mp3 demuxer avi demuxer: (needs rewrite) - fix AVI index offset base position handling ('no video stream found' bug) @@ -19,37 +32,31 @@ - fix for growing avi files (movi_end pos > stream->end_pos) - implement forward seeking in avi streams with no index -demuxer: -- fix .asf demuxer bugs -- forward seeking from stdin ? -- fix the whole syncing mechanism of Real demuxer -- implement mpeg-TS demuxer +mencoder: +- finish mencoder -ovc vfw (bitrate setting, codec selection etc) +- implement muxer layer (for mpg, ogm, mov support) +- add ogg/vorbis audio encoder +- stop/resume + +docs: +- migrate to XML/DocBook +- restructuring? FUTURE: ~~~~~~~ -decoders: -- fix DLLs: pegasusm, pegasusl, pegasusmwv, 3ivX, morgands, alaris, vcr1, pim1, - qpeg, rricm - demuxer: - demux_mpg: support for VDR's index files for more accurate seeking - implement seeking for YUV4MPEG_2_ decoders: -- qtx support? - -mencoder: -- add ogg/vorbis audio encoder -- stop/resume +- fix DLLs: pegasusm, pegasusl, pegasusmwv, 3ivX, morgands, alaris, vcr1, pim1, + qpeg, rricm -gui: -- playlist ? -- preferences ? +decoders: +- qtx support? other: - dvd server - mga_vid crtc2 fix - make nvidia_vid ;) -- display OSD and subtitles using DVB card's OSD -- sync with mplayerxp-vidix (pm3 and rage128)

4 6

CVS: main/libao2 ao_mpegpes.c,1.8,1.9
by Richard Felker CVS 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv14578/libao2 Modified Files: ao_mpegpes.c Log Message: no need for ioctl.h if not using dvb Index: ao_mpegpes.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ao_mpegpes.c 13 Mar 2002 01:45:42 -0000 1.8 +++ ao_mpegpes.c 31 Jul 2002 05:25:57 -0000 1.9 @@ -1,6 +1,8 @@ #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_DVB #include <sys/ioctl.h> +#endif #include "../config.h"

1 0

CVS: main/libvo spuenc.h,1.1,1.2 spuenc.c,1.2,1.3
by Richard Felker CVS 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv13753/libvo Modified Files: spuenc.h spuenc.c Log Message: fix silly shorthand that could cause trouble porting Index: spuenc.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/spuenc.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- spuenc.h 3 Apr 2002 10:05:35 -0000 1.1 +++ spuenc.h 31 Jul 2002 05:23:09 -0000 1.2 @@ -25,12 +25,12 @@ typedef struct { int x, y; - u_int rgb[4]; - u_char* pixels; + unsigned int rgb[4]; + unsigned char* pixels; } pixbuf; typedef struct { - u_char data[DATASIZE]; + unsigned char data[DATASIZE]; int count; /* the count of bytes written */ int oddstart; int nibblewaiting; Index: spuenc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/spuenc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- spuenc.c 4 Apr 2002 16:35:03 -0000 1.2 +++ spuenc.c 31 Jul 2002 05:23:09 -0000 1.3 @@ -35,7 +35,7 @@ int controlstart= ed->count; int x1; int i; - u_int top, left, bottom, right; + unsigned int top, left, bottom, right; top= 450 - pb->y/2; left=(720 / 2) - (pb->x / 2); @@ -138,7 +138,7 @@ } static void -encode_put_nibble( encodedata* ed, u_char nibble ) { +encode_put_nibble( encodedata* ed, unsigned char nibble ) { if( ed->nibblewaiting ) { ed->data[ed->count++]|= nibble; ed->nibblewaiting= 0; @@ -175,7 +175,7 @@ static void encode_do_row( encodedata* ed, pixbuf* pb, int row ) { int i= 0; - u_char* pix= pb->pixels + row * pb->x; + unsigned char* pix= pb->pixels + row * pb->x; int color= *pix; int n= 0; /* the number of pixels of this color */ @@ -237,7 +237,7 @@ pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) { int colors, chrs, l, n; char c[4], table[256]; - u_char *b, *i; + unsigned char *b, *i; sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs); if( colors > 4 ) {

1 0

CVS: main/Gui/mplayer/gtk about.c,1.9,1.10 eq.c,1.6,1.7 fs.c,1.21,1.22 mb.c,1.10,1.11 opts.c,1.6,1.7 pl.c,1.5,1.6 sb.c,1.11,1.12 url.c,1.4,1.5
by Zoltan Ponekker 31 Jul '02

31 Jul '02

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var/tmp.root/cvs-serv7200/mplayer/gtk Modified Files: about.c eq.c fs.c mb.c opts.c pl.c sb.c url.c Log Message: gtk dialog bug fix Index: about.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/about.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- about.c 25 Jul 2002 20:26:37 -0000 1.9 +++ about.c 30 Jul 2002 23:09:24 -0000 1.10 @@ -15,7 +15,7 @@ if ( gtkVAboutBox ) gtkActive( AboutBox ); else AboutBox=create_About(); gtk_widget_show( AboutBox ); - gtkVisible++; + gtkIncVisible(); } void ab_AboutBox_show( GtkButton * button,gpointer user_data ) @@ -25,7 +25,7 @@ { gtkVAboutBox=(int)user_data; gtk_widget_destroy( AboutBox ); - gtkVisible--; + gtkDecVisible(); } GtkWidget * create_About( void ) Index: eq.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eq.c 30 Jul 2002 11:50:20 -0000 1.6 +++ eq.c 30 Jul 2002 23:09:24 -0000 1.7 @@ -142,13 +142,13 @@ if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) gtk_widget_show( Config ); gtk_widget_show( Equalizer ); - gtkVisible++; + gtkIncVisible(); } void HideEqualizer( void ) { if ( !gtkVEqualizer ) return; - gtkVEqualizer=0; gtkVisible--; + gtkVEqualizer=0; gtkDecVisible(); gtk_widget_hide( Equalizer ); gtk_widget_destroy( Equalizer ); if ( gtkVEquConfig ) HideEquConfig(); Index: fs.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fs.c 30 Jul 2002 11:50:20 -0000 1.21 +++ fs.c 30 Jul 2002 23:09:24 -0000 1.22 @@ -286,7 +286,7 @@ gtk_window_set_modal( GTK_WINDOW( fsFileSelect ),modal ); - gtk_widget_show( fsFileSelect ); gtkVisible++; + gtk_widget_show( fsFileSelect ); gtkIncVisible(); } void HideFileSelect( void ) @@ -294,7 +294,7 @@ if ( !gtkVFileSelect ) return; gtk_widget_hide( fsFileSelect ); gtk_widget_destroy( fsFileSelect ); - gtkVFileSelect=0; gtkVisible--; + gtkVFileSelect=0; gtkDecVisible(); } void fs_fsFileSelect_destroy( GtkObject * object,gpointer user_data ) Index: mb.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/mb.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mb.c 25 Jul 2002 20:26:37 -0000 1.10 +++ mb.c 30 Jul 2002 23:09:24 -0000 1.11 @@ -20,11 +20,11 @@ else MessageBox=create_MessageBox( 0 ); gtkSetLayer( MessageBox ); if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 ); - gtkVisible++; + gtkIncVisible(); } static void on_Ok_released( GtkButton * button,gpointer user_data ) -{ gtkVMessageBox=0; gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); gtkVisible--; } +{ gtkVMessageBox=0; gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); gtkDecVisible(); } static void on_MessageBox_show( GtkButton * button,gpointer user_data ) { gtkVMessageBox=(int)user_data; } Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- opts.c 30 Jul 2002 11:50:20 -0000 1.6 +++ opts.c 30 Jul 2002 23:09:24 -0000 1.7 @@ -228,7 +228,7 @@ gtk_signal_connect( GTK_OBJECT( CLADrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( CLVDrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)1 ); - gtkVPreferences=1; gtkVisible++; + gtkVPreferences=1; gtkIncVisible(); gtk_widget_show( Preferences ); gtkSetLayer( Preferences ); gtkMessageBox( GTK_MB_WARNING,MSGTR_PREFERENCES_Message ); @@ -237,7 +237,7 @@ void HidePreferences( void ) { if ( !gtkVPreferences ) return; - gtkVPreferences=0; gtkVisible--; + gtkVPreferences=0; gtkDecVisible(); gtk_widget_hide( Preferences ); gtk_widget_destroy( Preferences ); HideOSSConfig(); } @@ -1465,7 +1465,7 @@ gtk_widget_show( OSSConfig ); gtkSetLayer( OSSConfig ); - gtkVOSSConfig=1; gtkVisible++; + gtkVOSSConfig=1; gtkIncVisible(); } void HideOSSConfig( void ) @@ -1473,7 +1473,7 @@ if ( !gtkVOSSConfig ) return; gtk_widget_hide( OSSConfig ); gtk_widget_destroy( OSSConfig ); - gtkVOSSConfig=0; gtkVisible--; + gtkVOSSConfig=0; gtkDecVisible(); } static void ossDestroy( GtkObject * object,gpointer user_data ) Index: pl.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pl.c 19 Jul 2002 20:51:46 -0000 1.5 +++ pl.c 30 Jul 2002 23:09:24 -0000 1.6 @@ -169,7 +169,7 @@ } gtk_clist_thaw( GTK_CLIST( CLSelected ) ); - gtk_widget_show( PlayList ); gtkVisible++; + gtk_widget_show( PlayList ); gtkIncVisible(); } void HidePlayList( void ) @@ -180,7 +180,7 @@ if ( CLFileSelected ) free( CLFileSelected ); CLFileSelected=NULL; if ( old_path ) free( old_path ); old_path=strdup( current_path ); gtk_widget_hide( PlayList ); - gtk_widget_destroy( PlayList ); gtkVisible--; + gtk_widget_destroy( PlayList ); gtkDecVisible(); } static void plDestroy( GtkObject * object,gpointer user_data ) Index: sb.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sb.c 25 Jul 2002 20:26:37 -0000 1.11 +++ sb.c 30 Jul 2002 23:09:24 -0000 1.12 @@ -29,13 +29,13 @@ { if ( gtkVSkinBrowser ) gtkActive( SkinBrowser ); else SkinBrowser=create_SkinBrowser(); - gtkVisible++; + gtkIncVisible(); } void HideSkinBrowser( void ) { if ( !gtkVSkinBrowser ) return; - gtkVSkinBrowser=0; gtkVisible--; + gtkVSkinBrowser=0; gtkDecVisible(); gtk_widget_destroy( SkinBrowser ); } Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/url.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- url.c 19 Jul 2002 20:51:46 -0000 1.4 +++ url.c 30 Jul 2002 23:09:24 -0000 1.5 @@ -34,7 +34,7 @@ } gtk_widget_show( URL ); - gtkVURLDialogBox=1; gtkVisible++; + gtkVURLDialogBox=1; gtkIncVisible(); } void HideURLDialogBox( void ) @@ -42,7 +42,7 @@ if ( !gtkVURLDialogBox ) return; gtk_widget_hide( URL ); gtk_widget_destroy( URL ); - gtkVURLDialogBox=0; gtkVisible--; + gtkVURLDialogBox=0; gtkDecVisible(); } static gboolean on_URL_destroy_event( GtkWidget * widget,GdkEvent * event,gpointer user_data )

1 0