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

CVS: main mplayer.c,1.615,1.616
by Zoltan Ponekker 14 May '03

14 May '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv21770 Modified Files: mplayer.c Log Message: disabling seek (look the patch) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.615 retrieving revision 1.616 diff -u -r1.615 -r1.616 --- mplayer.c 28 Nov 2002 19:01:24 -0000 1.615 +++ mplayer.c 28 Nov 2002 19:13:14 -0000 1.616 @@ -1954,6 +1954,7 @@ switch(cmd->id) { case MP_CMD_SEEK : { int v,abs; + if ( stream->type == STREAMTYPE_STREAM ) break; v = cmd->args[0].v.i; abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; if(abs==2) { /* Absolute seek to a specific timestamp in seconds */

2 1

CVS: main/libmpcodecs dec_audio.c,1.13,1.14 dec_audio.h,1.5,1.6
by Arpi of Ize 15 Dec '02

15 Dec '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv25169/libmpcodecs Modified Files: dec_audio.c dec_audio.h Log Message: aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dec_audio.c 29 Sep 2002 21:52:10 -0000 1.13 +++ dec_audio.c 5 Oct 2002 22:55:45 -0000 1.14 @@ -18,6 +18,8 @@ #include "ad.h" #include "../libao2/afmt.h" +#include "../libaf/af.h" + #ifdef USE_FAKE_MONO int fakemono=0; #endif @@ -118,6 +120,10 @@ sh_audio->samplerate,sh_audio->channels, sh_audio->samplesize*8,sh_audio->sample_format, sh_audio->i_bps,sh_audio->o_bps,sh_audio->i_bps*8*0.001); + + sh_audio->a_out_buffer_size=sh_audio->a_buffer_size; + sh_audio->a_out_buffer=sh_audio->a_buffer; + sh_audio->a_out_buffer_len=sh_audio->a_buffer_len; return 1; } @@ -210,23 +216,149 @@ void uninit_audio(sh_audio_t *sh_audio) { + if(sh_audio->afilter){ + mp_msg(MSGT_DECAUDIO,MSGL_V,"Uninit audio filters...\n"); + af_uninit(sh_audio->afilter); + sh_audio->afilter=NULL; + } if(sh_audio->inited){ mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudioStr,sh_audio->codec->drv); mpadec->uninit(sh_audio); sh_audio->inited=0; } + if(sh_audio->a_out_buffer!=sh_audio->a_buffer) free(sh_audio->a_out_buffer); + sh_audio->a_out_buffer=NULL; if(sh_audio->a_buffer) free(sh_audio->a_buffer); sh_audio->a_buffer=NULL; if(sh_audio->a_in_buffer) free(sh_audio->a_in_buffer); sh_audio->a_in_buffer=NULL; } + /* Init audio filters */ +int init_audio_filters(sh_audio_t *sh_audio, + int in_samplerate, int in_channels, int in_format, int in_bps, + int out_samplerate, int out_channels, int out_format, int out_bps, + int out_minsize, int out_maxsize){ + af_stream_t* afs=malloc(sizeof(af_stream_t)); + memset(afs,0,sizeof(af_stream_t)); + + // input format: same as codec's output format: + afs->input.rate = in_samplerate; + afs->input.nch = in_channels; + afs->input.format = in_format; + afs->input.bps = in_bps; + + // output format: same as ao driver's input format (if missing, fallback to input) + afs->output.rate = out_samplerate ? out_samplerate : afs->input.rate; + afs->output.nch = out_channels ? out_channels : afs->input.nch; + afs->output.format = out_format ? out_format : afs->input.format; + afs->output.bps = out_bps ? out_bps : afs->input.bps; + + // filter config: + afs->cfg.force = 0; + afs->cfg.list = NULL; + + mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Building audio filter chain for %dHz/%dch/%dbit -> %dHz/%dch/%dbit...\n", + afs->input.rate,afs->input.nch,afs->input.bps*8, + afs->output.rate,afs->output.nch,afs->output.bps*8); + + // let's autoprobe it! + if(0 != af_init(afs)){ + free(afs); + return 0; // failed :( + } + + // allocate the a_out_* buffers: + if(out_maxsize<out_minsize) out_maxsize=out_minsize; + if(out_maxsize<8192) out_maxsize=MAX_OUTBURST; // not sure this is ok + + sh_audio->a_out_buffer_size=out_maxsize; + sh_audio->a_out_buffer=malloc(sh_audio->a_out_buffer_size); + memset(sh_audio->a_out_buffer,0,sh_audio->a_out_buffer_size); + sh_audio->a_out_buffer_len=0; + + // ok! + sh_audio->afilter=(void*)afs; + return 1; +} + int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) { - if(sh_audio->inited) - return mpadec->decode_audio(sh_audio,buf,minlen,maxlen); + int declen; + af_data_t afd; // filter input + af_data_t* pafd; // filter output + + if(!sh_audio->inited) return -1; // no codec + if(!sh_audio->afilter){ + // no filter, just decode: + // FIXME: don't drop initial decoded data in a_buffer! + return mpadec->decode_audio(sh_audio,buf,minlen,maxlen); + } + +// declen=af_inputlen(sh_audio->afilter,minlen); + declen=af_calc_insize_constrained(sh_audio->afilter,minlen,maxlen, + sh_audio->a_buffer_size-sh_audio->audio_out_minsize); + + mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\ndecaudio: minlen=%d maxlen=%d declen=%d (max=%d)\n", + minlen, maxlen, declen, sh_audio->a_buffer_size); + + if(declen<=0) return -1; // error! + + // limit declen to buffer size: - DONE by af_calc_insize_constrained +// if(declen>sh_audio->a_buffer_size) declen=sh_audio->a_buffer_size; + + // decode if needed: + while(declen>sh_audio->a_buffer_len){ + int len=declen-sh_audio->a_buffer_len; + int maxlen=sh_audio->a_buffer_size-sh_audio->a_buffer_len; + + mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"decaudio: decoding %d bytes, max: %d (%d)\n", + len, maxlen, sh_audio->audio_out_minsize); + + if(maxlen<sh_audio->audio_out_minsize) break; // don't overflow buffer! + // not enough decoded data waiting, decode 'len' bytes more: + len=mpadec->decode_audio(sh_audio, + sh_audio->a_buffer+sh_audio->a_buffer_len, len, maxlen); + if(len<=0) break; // EOF? + sh_audio->a_buffer_len+=len; + } + if(declen>sh_audio->a_buffer_len) + declen=sh_audio->a_buffer_len; // still no enough data (EOF) :( + + // round to whole samples: +// declen/=sh_audio->samplesize*sh_audio->channels; +// declen*=sh_audio->samplesize*sh_audio->channels; + + // run the filters: + afd.audio=sh_audio->a_buffer; + afd.len=declen; + afd.rate=sh_audio->samplerate; + afd.nch=sh_audio->channels; + afd.format=sh_audio->sample_format; + afd.bps=sh_audio->samplesize; + //pafd=&afd; +// printf("\nAF: %d --> ",declen); + pafd=af_play(sh_audio->afilter,&afd); +// printf("%d \n",pafd->len); + + if(!pafd) return -1; // error + + mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"decaudio: declen=%d out=%d (max %d)\n", + declen, pafd->len, maxlen); + + // copy filter==>out: + if(maxlen < pafd->len) + mp_msg(MSGT_DECAUDIO,MSGL_WARN,"%i bytes of audio data lost due to buffer overflow, len = %i", pafd->len - maxlen,pafd->len); else - return -1; + maxlen=pafd->len; + memmove(buf, pafd->audio, maxlen); + + // remove processed data from decoder buffer: + sh_audio->a_buffer_len-=declen; + if(sh_audio->a_buffer_len>0) + memmove(sh_audio->a_buffer, sh_audio->a_buffer+declen, sh_audio->a_buffer_len); + + return maxlen; } void resync_audio_stream(sh_audio_t *sh_audio) Index: dec_audio.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dec_audio.h 28 Sep 2002 02:23:20 -0000 1.5 +++ dec_audio.h 5 Oct 2002 22:55:45 -0000 1.6 @@ -9,3 +9,8 @@ extern void resync_audio_stream(sh_audio_t *sh_audio); extern void skip_audio_frame(sh_audio_t *sh_audio); extern void uninit_audio(sh_audio_t *sh_audio); + +extern int init_audio_filters(sh_audio_t *sh_audio, + int in_samplerate, int in_channels, int in_format, int in_bps, + int out_samplerate, int out_channels, int out_format, int out_bps, + int out_minsize, int out_maxsize); \ No newline at end of file

4 4

CVS: main parser-mpcmd.c,1.1,1.2
by Alban Bedel CVS 14 Dec '02

14 Dec '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv5727 Modified Files: parser-mpcmd.c Log Message: Basic support for random playing (-rnd and -nornd) Index: parser-mpcmd.c =================================================================== RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- parser-mpcmd.c 12 Nov 2002 01:56:21 -0000 1.1 +++ parser-mpcmd.c 12 Nov 2002 23:41:32 -0000 1.2 @@ -177,6 +177,8 @@ { play_tree_t* entry = play_tree_new(); UNSET_GLOBAL; + if(last_parent->flags & PLAY_TREE_RND) + entry->flags |= PLAY_TREE_RND; if(last_entry == NULL) { play_tree_set_child(last_parent,entry); } else { @@ -222,6 +224,16 @@ pt->loop = l; tmp = 1; } + } else if(strcasecmp(opt,"rnd") == 0) { + if(last_entry && last_entry->child) + last_entry->flags |= PLAY_TREE_RND; + else + last_parent->flags |= PLAY_TREE_RND; + } else if(strcasecmp(opt,"nornd") == 0) { + if(last_entry && last_entry->child) + last_entry->flags &= ~PLAY_TREE_RND; + else + last_parent->flags &= ~PLAY_TREE_RND; } else { m_option_t* mp_opt = NULL; play_tree_t* entry = NULL; @@ -230,6 +242,8 @@ if(tmp > 0) { // It's an entry if(entry) { add_entry(entry); + if((last_parent->flags & PLAY_TREE_RND) && entry->child) + entry->flags |= PLAY_TREE_RND; UNSET_GLOBAL; } else if(mode == LOCAL) // Entry is empty we have to drop his params mode = DROP_LOCAL;

3 2

CVS: main/etc codecs.conf,1.250,1.251
by Alex Beregszaszi 30 Nov '02

30 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv417 Modified Files: codecs.conf Log Message: added imagepower and morgan mjpeg2k codecs Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- codecs.conf 28 Nov 2002 21:37:07 -0000 1.250 +++ codecs.conf 30 Nov 2002 23:51:08 -0000 1.251 @@ -569,6 +569,24 @@ dll "LCodcCMP.dll" out BGR24,BGR15 +videocodec imagepower + info "ImagePower MJPEG2000" + status buggy + fourcc IPJ2 + driver vfw + dll "jp2avi.dll" + out BGR32,BGR24,BGR15 + +videocodec m3jpeg2k + info "Morgan MJPEG2000" + status working + fourcc MJ2C + driver vfw + dll "m3jp2k32.dll" + out YV12,I420,IYUV + out YUY2,UYVY + out BGR32,BGR24,BGR15 + ; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm videocodec m3jpegds info "Morgan MJPEG"

2 1

CVS: main/DOCS/Hungarian skin-hu.html,1.6,1.7
by Winner of tha face compo 30 Nov '02

30 Nov '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv17270/Hungarian Modified Files: skin-hu.html Log Message: fixes Index: skin-hu.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/skin-hu.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- skin-hu.html 28 Nov 2002 20:35:54 -0000 1.6 +++ skin-hu.html 30 Nov 2002 22:15:42 -0000 1.7 @@ -76,8 +76,9 @@ A skineket a következõ könyvtárakban (és a megadott sorrendben) keresi a program: <pre> + $(DATADIR)/Skin/ + $(PREFIX)/share/mplayer/Skin/ ~/.mplayer/Skin/ - /usr/local/share/mplayer/Skin/ </pre>

1 0

CVS: main/loader module.c,1.14,1.15
by Alex Beregszaszi 30 Nov '02

30 Nov '02

Update of /cvsroot/mplayer/main/loader In directory mail:/var/tmp.root/cvs-serv10948 Modified Files: module.c Log Message: both qt5 and qt6 patching support (qt6 addresses found by arpi) Index: module.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/module.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- module.c 25 Nov 2002 20:08:59 -0000 1.14 +++ module.c 30 Nov 2002 22:02:37 -0000 1.15 @@ -317,46 +317,6 @@ /* decrement the dependencies through the MODULE_FreeLibrary call. */ pwm->refCount++; - if(strstr(libname,"QuickTime.qts")){ - void** ptr=0x62b75ca4; - int i; - fprintf(stderr,"QuickTime.qts patched!!! old entry=%p\n",ptr[0]); - // NOP out directx, fontmanager and some other init calls: - for(i=0;i<5;i++) ((char*)0x6299e842)[i]=0x90; - for(i=0;i<28;i++) ((char*)0x6299e86d)[i]=0x90; - for(i=0;i<5;i++) ((char*)0x6299e898)[i]=0x90; - for(i=0;i<9;i++) ((char*)0x6299e8ac)[i]=0x90; - /* remove threads */ -#if 1 - for (i=0;i<0x6a;i++) ((char*)0x62a61b10)[i]=0x90; -#else - /* callers */ - for (i=0;i<5;i++) ((char*)0x629487c5)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x6294b275)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x629a24b1)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x629afc5a)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x62af799c)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x62af7efe)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x62afa33e)[i]=0x90; -#endif - /* load fonts */ -// for (i=0;i<5;i++) ((char*)0x6288dd77)[i]=0x90; - /* terminateqtml fix */ -#if 0 - for (i=0;i<2;i++) ((char*)0x629a13c7)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x629a13cb)[i]=0x90; - for (i=0;i<5;i++) ((char*)0x62890337)[i]=0x90; -// for (i=0;i<5;i++) ((char*)0x629a13d5)[i]=0x90; -// for (i=0;i<5;i++) ((char*)0x6299fe14)[i]=0x90; -#endif -#ifdef EMU_QTX_API - report_entry = report_func; - report_ret = report_func_ret; - wrapper_target=ptr[0]; - ptr[0]=wrapper; -#endif - } - SetLastError( err ); /* restore last error */ return pwm; } @@ -462,6 +422,67 @@ if (!wm) printf("Win32 LoadLibrary failed to load: %s\n", checked); + if (strstr(libname,"QuickTime.qts") && wm) + { + void** ptr; + void *dispatch_addr; + int i; + +// dispatch_addr = GetProcAddress(wm->module, "theQuickTimeDispatcher", TRUE); + dispatch_addr = PE_FindExportedFunction(wm, "theQuickTimeDispatcher", TRUE); + if (dispatch_addr == 0x62924c30) + { + fprintf(stderr, "QuickTime5 DLLs found\n"); + ptr = 0x62b75ca4; // dispatch_ptr + for (i=0;i<5;i++) ((char*)0x6299e842)[i]=0x90; // make_new_region ? + for (i=0;i<28;i++) ((char*)0x6299e86d)[i]=0x90; // call__call_CreateCompatibleDC ? + for (i=0;i<5;i++) ((char*)0x6299e898)[i]=0x90; // jmp_to_call_loadbitmap ? + for (i=0;i<9;i++) ((char*)0x6299e8ac)[i]=0x90; // call__calls_OLE_shit ? + for (i=0;i<106;i++) ((char*)0x62a61b10)[i]=0x90; // disable threads +#if 0 + /* CreateThread callers */ + for (i=0;i<5;i++) ((char*)0x629487c5)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x6294b275)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x629a24b1)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x629afc5a)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x62af799c)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x62af7efe)[i]=0x90; + for (i=0;i<5;i++) ((char*)0x62afa33e)[i]=0x90; +#endif + +#if 0 + /* TerminateQTML fix */ + for (i=0;i<47;i++) ((char*)0x62afa3b8)[i]=0x90; // terminate thread + for (i=0;i<47;i++) ((char*)0x62af7f78)[i]=0x90; // terminate thread + for (i=0;i<77;i++) ((char*)0x629a13d5)[i]=0x90; + ((char *)0x6288e0ae)[0] = 0xc3; // font/dc remover + for (i=0;i<24;i++) ((char*)0x6287a1ad)[i]=0x90; // destroy window +#endif + } else if (dispatch_addr == 0x6693b330) + { + fprintf(stderr, "QuickTime6 DLLs found\n"); + ptr = 0x66bb9524; // dispatcher_ptr + for (i=0;i<5;i++) ((char *)0x66a730cc)[i]=0x90; // make_new_region + for (i=0;i<28;i++) ((char *)0x66a730f7)[i]=0x90; // call__call_CreateCompatibleDC + for (i=0;i<5;i++) ((char *)0x66a73122)[i]=0x90; // jmp_to_call_loadbitmap + for (i=0;i<9;i++) ((char *)0x66a73131)[i]=0x90; // call__calls_OLE_shit + for (i=0;i<96;i++) ((char *)0x66aac852)[i]=0x90; // disable threads + } else + { + fprintf(stderr, "Unsupported QuickTime version (0x%x)\n", + dispatch_addr); + return NULL; + } + + fprintf(stderr,"QuickTime.qts patched!!! old entry=%p\n",ptr[0]); + +#ifdef EMU_QTX_API + report_entry = report_func; + report_ret = report_func_ret; + wrapper_target=ptr[0]; + ptr[0]=wrapper; +#endif + } return wm ? wm->module : 0; }

1 0

CVS: main/etc codecs.conf,1.249,1.250
by Atmosfear 30 Nov '02

30 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv29740/etc Modified Files: codecs.conf Log Message: Update with JPEG FourCC, as found in SGI created baard.avi photo-jpeg. See ffmpeg-devel list, change to LEAD codec is untested as I don't have it... Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- codecs.conf 26 Nov 2002 23:06:05 -0000 1.249 +++ codecs.conf 28 Nov 2002 21:37:07 -0000 1.250 @@ -501,7 +501,7 @@ status working fourcc MJPG,mjpg fourcc AVRn,AVDJ ; AVID - fourcc jpeg ; photo-jpeg + fourcc jpeg,JPEG ; photo-jpeg fourcc mjpa ; Apple MJPEG-A (Quicktime) fourcc JFIF ; SMJPEG (Loki) fourcc ijpg,IJPG ; -mf type=jpeg @@ -517,7 +517,7 @@ info "Independent JPEG Group's codec" status working fourcc ijpg,IJPG ; -mf type=jpeg - fourcc jpeg ; MOV Photo Jpeg + fourcc jpeg,JPEG ; MOV Photo Jpeg fourcc AVRn,AVDJ ; AVID driver ijpg dll libjpeg @@ -564,6 +564,7 @@ comment "supports interlaced MJPEG" fourcc MJPG fourcc jpeg MJPG ; MOV Photo Jpeg + fourcc JPEG MJPG ; AVI Photo Jpeg driver vfw dll "LCodcCMP.dll" out BGR24,BGR15

4 7

CVS: main/DOCS/Hungarian skin-hu.html,1.5,1.6
by Zoltan Ponekker 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv15799 Modified Files: skin-hu.html Log Message: updating Index: skin-hu.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/skin-hu.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- skin-hu.html 11 Nov 2002 05:07:26 -0000 1.5 +++ skin-hu.html 28 Nov 2002 20:35:54 -0000 1.6 @@ -76,12 +76,12 @@ A skineket a következõ könyvtárakban (és a megadott sorrendben) keresi a program: <pre> - /usr/local/share/mplayer/Skin/ ~/.mplayer/Skin/ + /usr/local/share/mplayer/Skin/ </pre> -Az elsõ könyvtár más is lehet, attól függõen, hogy hogyan volt konfigurálva +A második könyvtár más is lehet, attól függõen, hogy hogyan volt konfigurálva az MPlayer (lásd a <code>configure</code> script <code>--datadir</code> kapcsolóját). @@ -94,9 +94,8 @@ <h3><a name="images">2.2. Képformátumok</a></h3> -A skinhez használt képek trucolor (24 vagy 32 bit/pixel) BMP, TGA vagy PNG -formátumban lehetnek (a TGA-nak tömörítetlennek kell lennie). -Jó tömörítési hatásfoka miatt a PNG javasolt. +A skinhez használt képek trucolor (24 vagy 32 bit/pixel) PNG +formátumban lehetnek. A fõablakban (lásd alább) teljesen "átlátszó" részeket tartalmazó képeket @@ -146,7 +145,9 @@ Megjegyzés: a fõablak rajzolásához használt képek tartalmazhatnak teljesen átlátszó részeket, ahogy arról a -<a href="#images">képformátumoknál</a> már szó volt. +<a href="#images">képformátumoknál</a> már szó volt. Ha az X Server nem tartalmazza az XShape bõvitményt, akkor +az átlátszónak megjelölt részek fekete színüek lesznek. Ha ezt ki szeretnéd használni, akkor a main ablak hátter +képének szélességének oszthatónak kell lennie nyolccal. </li> @@ -279,7 +280,7 @@ end window = menu - ; ... a skin menü elemei ... + ; ... a menü elemei ... end end </pre></td></tr></table> @@ -287,13 +288,13 @@ Végezetül néhány szó az elemekhez rendelt képek megadásáról. -A fájlok nevét könyvtárak nélkül kell megadni, ugyanis a képeket a skin +A fájlok nevét könyvtárak nélkül kell megadni, ugyanis a képeket a skin file könyvtárában keresi az MPlayer. A fájlok kiterjesztése elhagyható. Ha a megadott fájl nem létezik, akkor az MPlayer megpróbálja betölteni a <fájlnév>.<kit> nevû fájlt, ahol a <kit> -helyére a tga, TGA, bmp, BMP, png -és PNG végzõdést helyezi (a megadott sorrendben). Az elsõ létezõ fájlt +helyére a png +vagy PNG végzõdést helyezi (a megadott sorrendben). Az elsõ létezõ fájlt fogja betölteni. @@ -307,19 +308,9 @@ </pre> </blockquote> -Ennek hatására az MPlayer megpróbálja betölteni a main, main.tga, -main.TGA, main.bmp stb. fájlt, így végül megtalálja a +Ennek hatására az MPlayer megpróbálja betölteni a main, main.png, +majd a main.PNG fájlt, így végül megtalálja a main.png-t. - -Ha (mondjuk tévedésbõl) ezt írnád: -<blockquote> -<pre> - base = main.bmp, -2, -2 -</pre> -</blockquote> -akkor az MPlayer a main.bmp, main.bmp.tga, main.bmp.TGA, -main.bmp.bmp stb. betöltésével próbálkozna, majd végül feladná a dolgot, -hiszen a könyvtárban main.png van, nem pedig main.bmp. </td></tr></table> @@ -341,7 +332,7 @@ Figyelem: a képen az átlátszónak megjelölt területek (#FF00FF színûek) -feketék lesznek az XShape támogatás nélküli X szervereken. +feketék lesznek az XShape támogatás nélküli X szervereken. A kép szélességének oszthatónak kell lennie nyolccal. </dd> </dl> @@ -531,6 +522,12 @@ <tr><td align=center><kbd>$e</kbd></td> <td>az "e" karakter, ha a lejátszás szünetel, és a font tartalmazza az "e" karaktert</td></tr> +<tr><td align=center><kbd>$x</kbd></td> + <td>a film szélessége</td></tr> +<tr><td align=center><kbd>$y</kbd></td> + <td>a film magassága</td></tr> +<tr><td align=center><kbd>$C</kbd></td> + <td>a használt codec neve</td></tr> </table></div> Megjegyzés: a <kbd>$a</kbd>, <kbd>$T</kbd>, <kbd>$p</kbd>, <kbd>$s</kbd> @@ -718,11 +715,6 @@ </table> </div> - -Megjegyzés: jelenleg csak a "p", "s", "e", "n", "m" és "t" -szimbólum használható. - - <h2><a name="guimsg">A. függelék: GUI üzenetek</a></h2> A gombok, potméterek és menüpontok az alább felsorolt üzeneteket generálhatják. @@ -845,6 +837,9 @@ <dt>evAbout <dd>Megjeleníti a program információs ablakát. +<dt>evDropSubtitle +<dd>Törli az aktuálisan használt felirat fájlt. + <dt>evEqualizer <dd>Bekapcsolja/kikapcsolja az equalizert. @@ -861,14 +856,32 @@ <dd>Ugyanaz mint az evLoad, de betöltés után automatikusan megkezdi a lejátszást. +<dt>evLoadSubtitle +<dd>Betölt egy felirat fájlt (amit egy fájlválasztó ablakban jelölhetsz ki). + +<dt>evLoadAudioFile +<dd>Betölt egy hang fájlt (amit egy fájlválasztó ablakban jelölhetsz ki). + <dt>evNone <dd>Üres üzenet, nincs hatása. (Legfeljebb csak a CVS verzióban. :-)) <dt>evPlayList <dd>Megnyitja/bezárja a lejátszólista ablakot. +<dt>evPlayDVD +<dd>Megpróbálja megnyitni a megadott DVDROM - ban lévõ lemezt. + +<dt>evPlayVCD +<dd>Megpróbálja megnyitni a megadott CDROM - ban lévõ lemezt. + <dt>evPreferences <dd>Megnyitja a beállítások ablakot. + +<dt>evSetAspect +<dd>Beállítja a képarányt a megadottra. + +<dt>evSetURL +<dd>Elõvarázsolja az URL dialogus ablakot. <dt>evSkinBrowser <dd>Megnyitja a skinböngészõ ablakot.

3 2

CVS: main/libvo vo_dxr3.c,1.110,1.111
by David Holm CVS 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv24712/libvo Modified Files: vo_dxr3.c Log Message: Use MVCOMMAND_SYNC Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- vo_dxr3.c 11 Nov 2002 15:20:25 -0000 1.110 +++ vo_dxr3.c 29 Nov 2002 21:40:37 -0000 1.111 @@ -6,11 +6,11 @@ */ /* ChangeLog added 2002-01-10 - * 2002-01-03: + * 2002-11-03: * Cleaned up syncing code and renamed setup variables so * they can be accessed from the GUI. * - * 2002-01-02: + * 2002-11-02: * Added native overlay support, activate with :overlay * you have to run dxr3view to modify settings (or manually * edit the files in ~/.overlay. @@ -418,7 +418,7 @@ #ifdef MVCOMMAND_SYNC reg.microcode_register = 1; reg.reg = 0; - reg.val = MVCOMMAND_START; + reg.val = MVCOMMAND_SYNC; ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg); #endif

1 0

CVS: main/DOCS skin-en.html,1.8,1.9
by Winner of tha face compo 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv14846/DOCS Modified Files: skin-en.html Log Message: sync Index: skin-en.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/skin-en.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- skin-en.html 20 Oct 2002 12:20:39 -0000 1.8 +++ skin-en.html 29 Nov 2002 21:32:41 -0000 1.9 @@ -106,8 +106,7 @@ <h3><a name="images">2.2 Image formats</a></h3> -Images must be truecolor (24 or 32 bpp) and can be in BMP, PNG or uncompressed -TGA format. The preferred format is PNG as it compresses very well. +Images must be truecolor (24 or 32 bpp) PNG. In the main window (see below) you can use images with `transparency': @@ -165,7 +164,10 @@ Note: all images can have full transparency as described in the -section about <a href="#images">image formats</a>. +section about <a href="#images">image formats</a>. If the X Server doesn't +support the XShape extension, the parts marked transparent will be black. If +you'd like to use this feature, the width of the main window's background image +must be dividable by 8. </li> @@ -307,7 +309,7 @@ end window = menu - ; ... items for skin menu ... + ; ... items for menu ... end end </pre></td></tr></table> @@ -317,8 +319,7 @@ searched for in the <code>Skin</code> directory. You may (but you need not) specify the extension of the file. If the file does not exist, MPlayer tries to load the file <code><filename>.<ext></code>, where -<code>tga</code>, <code>TGA</code>, <code>bmp</code>, <code>BMP</code>, -<code>png</code> and <code>PNG</code> is tried for <code><ext></code> +<code>png</code> and <code>PNG</code> are tried for <code><ext></code> (in this order). The first matching file will be used. @@ -350,20 +351,9 @@ </pre> </blockquote> -MPlayer tries to load <code>main</code>, <code>main.tga</code>, -<code>main.TGA</code>, <code>main.bmp</code> etc, so that <code>main.png</code> -will be found. +MPlayer tries to load <code>main</code>, <code>main.png</code>, +<code>main.PNG</code> files. -If (by accident) you wrote -<blockquote> -<pre> - base = main.bmp, -1, -1 -</pre> -</blockquote> -then <code>main.bmp</code>, <code>main.bmp.tga</code>, <code>main.bmp.TGA</code>, -<code>main.bmp.bmp</code> would be searched for and MPlayer would finally -give up because there is no <code>main.bmp</code> in the directory, only -<code>main.png</code>. </td></tr></table> @@ -383,7 +373,8 @@ <div> Warning: Transparent regions in the image (colored #FF00FF) appear -black on X servers without the XShape extension. +black on X servers without the XShape extension. The image's width must be +dividable by 8. </div> </dd> @@ -577,6 +568,15 @@ <td>the "e" character (if playback is paused and the font has the "e" character) </td></tr> +<tr><td align=center><kbd>$x</kbd></td> + <td>movie width + </td></tr> +<tr><td align=center><kbd>$y</kbd></td> + <td>movie height + </td></tr> +<tr><td align=center><kbd>$C</kbd></td> + <td>used codec's name + </td></tr> </table> @@ -741,11 +741,6 @@ <td align=left>stream is a URL</td></tr> </table> - - -Note: Currently only 'p', 's', 'e', 'n', 'm' and 't' are used. - - <h2><a name="guimsg">Appendix A: GUI messages</a></h2> @@ -868,6 +863,9 @@ <dt>evAbout <dd>Open the about window. +<dt>evDropSubtitle +<dd>Disables the currently used subtitle. + <dt>evEqualizer <dd>Turn the equalizer on/off. @@ -885,14 +883,32 @@ <dd>Does the same as <code>evLoad</code>, but it automatically starts playing after the file is loaded. +<dt>evLoadSubtitle +<dd>Loads a subtitle file (with the fileselector) + +<dt>evLoadAudioFile +<dd>Loads an audio file (with the fileselector) + <dt>evNone <dd>Empty message, it has no effect (except maybe in CVS versions :-)). <dt>evPlayList <dd>Open/close the playlist window. +<dt>evPlayDVD +<dd>Tries to open the disc in the given DVDROM drive. + +<dt>evPlayVCD +<dd>Tries to open the disc in the given CDROM drive. + <dt>evPreferences <dd>Open the preferences window. + +<dt>evSetAspect +<dd>Sets displayed image aspect. + +<dt>evSetURL +<dd>Displays the URL dialog window. <dt>evSkinBrowser <dd>Open the skin browser window.

1 0