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

CVS: main mplayer.c,1.889,1.890
by syncmail＠mplayerhq.hu 27 Nov '05

27 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv13254 Modified Files: mplayer.c Log Message: Add a function to remove osd msg and use it to remove the "OSD: enabled" msg when switching the OSD to a level above 1. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.889 retrieving revision 1.890 diff -u -r1.889 -r1.890 --- mplayer.c 20 Nov 2005 23:44:46 -0000 1.889 +++ mplayer.c 27 Nov 2005 23:29:33 -0000 1.890 @@ -1104,6 +1104,29 @@ } /** + * \brief Remove a message from the OSD stack + * + * This function can be used to get rid of a message right away. + * + */ + +static void rm_osd_msg(int id) { + mp_osd_msg_t *msg,*last=NULL; + + // Search for the msg + for(msg = osd_msg_stack ; msg && msg->id != id ; + last = msg, msg = msg->prev); + if(!msg) return; + + // Detach it from the stack and free it + if(last) + last->prev = msg->prev; + else + osd_msg_stack = msg->prev; + free(msg); +} + +/** * \brief Get the current message fron the OSD stack * * This function decrement the message timer and destroy the old ones. @@ -3248,6 +3271,8 @@ if (v == -1 && osd_level <= 1) set_osd_msg(OSD_MSG_OSD_STATUS,0,osd_duration, MSGTR_OSDosd, osd_level ? MSGTR_OSDenabled : MSGTR_OSDdisabled); + else + rm_osd_msg(OSD_MSG_OSD_STATUS); } break; case MP_CMD_OSD_SHOW_TEXT : { set_osd_msg(OSD_MSG_TEXT,1,osd_duration,"%64s",cmd->args[0].v.s);

1 0

CVS: main/DOCS/tech cvs-howto.txt,1.23,1.24
by syncmail＠mplayerhq.hu 27 Nov '05

27 Nov '05

CVS change done by The Wanderer CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv13689/DOCS/tech Modified Files: cvs-howto.txt Log Message: grammar fix on the documentation-updates note Index: cvs-howto.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/cvs-howto.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cvs-howto.txt 26 Nov 2005 20:44:13 -0000 1.23 +++ cvs-howto.txt 27 Nov 2005 18:40:38 -0000 1.24 @@ -186,8 +186,8 @@ the CVS log message. Since the mplayer-cvslog mailing list is publicly archived you should add some spam protection to the email address. Send an answer to mplayer-dev-eng (or wherever you got the patch from) saying that - you applied the patch. If the patch contains a documentation part, commit - this as well, do not leave it to the documentation maintainers. + you applied the patch. If the patch contains a documentation change, commit + that as well; do not leave it to the documentation maintainers. 9. Do NOT commit to code actively maintained by others without permission. Send a patch to mplayer-dev-eng instead.

1 0

CVS: main/DOCS/tech cvs-howto.txt,1.22,1.23
by syncmail＠mplayerhq.hu 27 Nov '05

27 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv13023/DOCS/tech Modified Files: cvs-howto.txt Log Message: Note about handling patches that contain documentation updates. Index: cvs-howto.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/cvs-howto.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cvs-howto.txt 20 Apr 2005 20:22:57 -0000 1.22 +++ cvs-howto.txt 26 Nov 2005 20:44:13 -0000 1.23 @@ -186,7 +186,8 @@ the CVS log message. Since the mplayer-cvslog mailing list is publicly archived you should add some spam protection to the email address. Send an answer to mplayer-dev-eng (or wherever you got the patch from) saying that - you applied the patch. + you applied the patch. If the patch contains a documentation part, commit + this as well, do not leave it to the documentation maintainers. 9. Do NOT commit to code actively maintained by others without permission. Send a patch to mplayer-dev-eng instead.

3 2

CVS: main/TOOLS install-divx5.sh,1.1,1.2
by syncmail＠mplayerhq.hu 27 Nov '05

27 Nov '05

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var2/tmp/cvs-serv9444 Modified Files: install-divx5.sh Log Message: some comments and simplification Index: install-divx5.sh =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/install-divx5.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- install-divx5.sh 29 May 2005 13:46:57 -0000 1.1 +++ install-divx5.sh 27 Nov 2005 14:03:14 -0000 1.2 @@ -6,7 +6,8 @@ set -e site=http://download.divx.com/divx/ -filename=divx4linux501-20020418.tgz +packagename=divx4linux501-20020418 +filename=$packagename.tgz if [ `whoami` != root ]; then echo "You must be a root to start this script. Login As root first!" @@ -20,11 +21,11 @@ cd /var/tmp/mplayer$$ wget $site/$filename tar xzf $filename - cd divx4linux-20020418/ + cd $packagename/ sh install.sh cd .. rm -rf $filename - rm -rf divx4linux-20020418/ + rm -rf $packagename/ echo "Installed Succesfully!" rmdir /var/tmp/mplayer$$ ;;

1 0

CVS: main/libmpdemux mf.c,1.10,1.11
by syncmail＠mplayerhq.hu 27 Nov '05

27 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv10672/libmpdemux Modified Files: mf.c Log Message: Add support to get the list of files from a file containing one filename per line. Patch from devik (devik .at. cdi .dot. cz). Index: mf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/mf.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mf.c 18 Nov 2005 14:39:19 -0000 1.10 +++ mf.c 26 Nov 2005 17:10:17 -0000 1.11 @@ -40,9 +40,38 @@ mf=calloc( 1,sizeof( mf_t ) ); + if( filename[0] == '@' ) + { + FILE *lst_f=fopen(filename + 1,"r"); + if ( lst_f ) + { + fname=malloc( 255 ); + while ( fgets( fname,255,lst_f ) ) + { + /* remove spaces from end of fname */ + char *t=fname + strlen( fname ) - 1; + while ( t > fname && isspace( *t ) ) *(t--)=0; + if ( stat( fname,&fs ) ) + { + mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname ); + } + else + { + mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) ); + mf->names[mf->nr_of_files]=strdup( fname ); + mf->nr_of_files++; + } + } + fclose( lst_f ); + + mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files ); + goto exit_mf; + } + mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] %s is not indirect filelist\n",filename+1 ); + } + if( strchr( filename,',') ) { - fname=malloc( 255 ); mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] filelist: %s\n",filename ); while ( ( fname=strsep( &filename,"," ) ) )

3 2

CVS: main/libmpdemux url.c,1.29,1.30
by syncmail＠mplayerhq.hu 26 Nov '05

26 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv31956/libmpdemux Modified Files: url.c Log Message: Fix URL escaping to correctly handle URL containing an ip6 address or escaped special chars like & or ; Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- url.c 5 Nov 2005 00:55:34 -0000 1.29 +++ url.c 26 Nov 2005 15:57:39 -0000 1.30 @@ -19,18 +19,11 @@ int pos1, pos2,v6addr = 0; URL_t* Curl = NULL; char *escfilename=NULL; - char *unescfilename=NULL; char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL; int jumpSize = 3; if( url==NULL ) return NULL; - // Create temp filename space - unescfilename=malloc(strlen(url)+1); - if (!unescfilename ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); - goto err_out; - } escfilename=malloc(strlen(url)*3+1); if (!escfilename ) { mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); @@ -47,12 +40,7 @@ // Initialisation of the URL container members memset( Curl, 0, sizeof(URL_t) ); - //create unescaped/escaped versions of url - url_unescape_string(unescfilename,url); // this is to prevent us from escaping an unescaped string - // violating RFC 2396 - url_escape_string(escfilename,unescfilename); - free(unescfilename); - unescfilename = NULL; + url_escape_string(escfilename,url); // Copy the url in the URL container Curl->url = strdup(escfilename); @@ -198,7 +186,6 @@ return Curl; err_out: if (escfilename) free(escfilename); - if (unescfilename) free(unescfilename); if (Curl) url_free(Curl); return NULL; } @@ -243,10 +230,8 @@ *outbuf++='\0'; //add nullterm to string } -/* Replace specific characters in the URL string by an escape sequence */ -/* works like strcpy(), but without return argument */ -void -url_escape_string(char *outbuf, const char *inbuf) { +static void +url_escape_string_part(char *outbuf, const char *inbuf) { unsigned char c,c1,c2; int i,len=strlen(inbuf); @@ -261,12 +246,7 @@ if( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || - (c >= 0x7f) || /* fareast languages(Chinese, Korean, Japanese) */ - c=='-' || c=='_' || c=='.' || c=='!' || c=='~' || /* mark characters */ - c=='*' || c=='\'' || c=='(' || c==')' || /* do not touch escape character */ - c==';' || c=='/' || c=='?' || c==':' || c=='@' || /* reserved characters */ - c=='&' || c=='=' || c=='+' || c=='$' || c==',' || /* see RFC 2396 */ - c=='\0' ) { /* string term char */ + (c >= 0x7f)) { *outbuf++ = c; } else if ( c=='%' && ((c1 >= '0' && c1 <= '9') || (c1 >= 'A' && c1 <= 'F')) && ((c2 >= '0' && c2 <= '9') || (c2 >= 'A' && c2 <= 'F'))) { @@ -293,6 +273,67 @@ *outbuf++='\0'; } +/* Replace specific characters in the URL string by an escape sequence */ +/* works like strcpy(), but without return argument */ +void +url_escape_string(char *outbuf, const char *inbuf) { + unsigned char c; + int i = 0,j,len = strlen(inbuf); + char* tmp,*unesc = NULL, *in; + + // Look if we have an ip6 address, if so skip it there is + // no need to escape anything in there. + tmp = strstr(inbuf,"://["); + if(tmp) { + tmp = strchr(tmp+4,']'); + if(tmp && (tmp[1] == '/' || tmp[1] == ':' || + tmp[1] == '\0')) { + i = tmp+1-inbuf; + strncpy(outbuf,inbuf,i); + outbuf += i; + tmp = NULL; + } + } + + while(i < len) { + // look for the next char that must be kept + for (j=i;j<len;j++) { + c = inbuf[j]; + if(c=='-' || c=='_' || c=='.' || c=='!' || c=='~' || /* mark characters */ + c=='*' || c=='\'' || c=='(' || c==')' || /* do not touch escape character */ + c==';' || c=='/' || c=='?' || c==':' || c=='@' || /* reserved characters */ + c=='&' || c=='=' || c=='+' || c=='$' || c==',') /* see RFC 2396 */ + break; + } + // we are on a reserved char, write it out + if(j == i) { + *outbuf++ = c; + i++; + continue; + } + // we found one, take that part of the string + if(j < len) { + if(!tmp) tmp = malloc(len+1); + strncpy(tmp,inbuf+i,j-i); + tmp[j-i] = '\0'; + in = tmp; + } else // take the rest of the string + in = (char*)inbuf+i; + + if(!unesc) unesc = malloc(len+1); + // unescape first to avoid escaping escape + url_unescape_string(unesc,in); + // then escape, including mark and other reserved chars + // that can come from escape sequences + url_escape_string_part(outbuf,unesc); + outbuf += strlen(outbuf); + i += strlen(in); + } + *outbuf = '\0'; + if(tmp) free(tmp); + if(unesc) free(unesc); +} + #ifdef __URL_DEBUG void url_debug(const URL_t *url) {

1 0

CVS: main configure,1.1105,1.1106
by syncmail＠mplayerhq.hu 26 Nov '05

26 Nov '05

CVS change done by Guillaume Poirier CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv26105 Modified Files: configure Log Message: Correct optimization for C3, patch by Zuxy Meng < zuxy POIS meng AH gmail POIS com > Original thread Date: Nov 25, 2005 3:35 AM Subject: [MPlayer-dev-eng] [PATCH] Correct optimization for C3 Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1105 retrieving revision 1.1106 diff -u -r1.1105 -r1.1106 --- configure 22 Nov 2005 05:17:16 -0000 1.1105 +++ configure 26 Nov 2005 15:52:17 -0000 1.1106 @@ -909,15 +909,11 @@ fi ;; 6) iproc=686 - # VIA C3 has SSE, but doesn't have MMX2 - # workaround for SSE => MMX2 implication above - _mmx2=no if test "$pmodel" -ge 9; then proc=c3-2 - elif test "$pmodel" -ge 7; then - proc=c3 else - proc=i686 + proc=c3 + iproc=586 fi ;; *) proc=i686 iproc=i686 ;; @@ -960,7 +956,7 @@ if test "$proc" = "k6-3" || test "$proc" = "k6-2"; then cc_check -march=$proc $cpuopt=$proc || proc=k6 fi - if test "$proc" = "k6"; then + if test "$proc" = "k6" || test "$proc" = "c3"; then if not cc_check -march=$proc $cpuopt=$proc; then if cc_check -march=i586 $cpuopt=i686; then proc=i586-i686 @@ -975,7 +971,7 @@ if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then cc_check -march=$proc $cpuopt=$proc || proc=i586 fi - if test "$proc" = "i586" || test "$proc" = "c3" || test "$proc" = "c3-2"; then + if test "$proc" = "i586"; then cc_check -march=$proc $cpuopt=$proc || proc=i486 fi if test "$proc" = "i486" ; then

1 0

CVS: main AUTHORS,1.167,1.168
by syncmail＠mplayerhq.hu 25 Nov '05

25 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv25167 Modified Files: AUTHORS Log Message: skin authors, trailing whitespace cosmetics Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- AUTHORS 24 Nov 2005 11:51:16 -0000 1.167 +++ AUTHORS 25 Nov 2005 21:15:05 -0000 1.168 @@ -239,7 +239,7 @@ * vo_ggi updates Elsinghorst, Paul Wilhelm <paul(a)uni-bonn.de> - * GUI: remote ESD support including software mixer + * GUI: remote ESD support including software mixer Ernesti, Bernd <mplayer(a)lists.veego.de> * NetBSD support patches @@ -877,6 +877,9 @@ unknown author * iTunes, iTunes-mini +Azrael <azrael(a)azrael-uk.f2s.com> + * brushedGnome + Bekesi, Viktor (FRD) * standard, plastic, slim @@ -976,6 +979,9 @@ Szumiela, Marcin <marcin(a)szumiela.pl> * divxplayer +Tisi, Massimo <massimotisi(a)yahoo.it> + * clearplayer + Tyr, Jiri jun. <jirka(a)dts.cz> * DVDPlayer @@ -985,6 +991,9 @@ Veres, Imre <six(a)freemail.hu> * Canary +Vesko, Radic <rvesko(a)EUnet.yu> + * Linea + Vigvary, Balasz (Toky) * avifile @@ -997,5 +1006,5 @@ Wilamowski, Franciszek (Xenomorph) <higgs(a)hoth.amu.edu.pl> * Abyss, Blue, Blue-small -Zeising, Michael <michael(a)michaels-website.de> +Zeising, Michael <michael(a)michaels-website.de> * productive

1 0

CVS: main/libmpdemux cddb.c,1.21,1.22
by syncmail＠mplayerhq.hu 25 Nov '05

25 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv17884/libmpdemux Modified Files: cddb.c Log Message: When it comes to CD/DVD handling bsdi has a linux CD/DVD compatibility library, use this to fix building on this (weird ;)) system. patch by Steven M. Schultz sms __ at __ 2BSD __ dot __ COM Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cddb.c 18 Nov 2005 14:39:18 -0000 1.21 +++ cddb.c 25 Nov 2005 02:06:47 -0000 1.22 @@ -41,10 +41,12 @@ #if defined(__linux__) #include <linux/cdrom.h> -#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <sys/cdio.h> #elif defined(WIN32) #include <ddk/ntddcdrm.h> +#elif (__bsdi__) + #include <dvd.h> #endif #include "cdd.h" @@ -60,7 +62,7 @@ static cd_toc_t cdtoc[100]; static int cdtoc_last_track; -#if defined(__linux__) +#if defined(__linux__) || defined(__bsdi__) int read_toc(const char *dev) { int drive; @@ -131,7 +133,7 @@ return toc.LastTrack; } -#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) int read_toc(const char *dev) { int drive;

1 0

CVS: main AUTHORS,1.166,1.167
by syncmail＠mplayerhq.hu 24 Nov '05

24 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv31049 Modified Files: AUTHORS Log Message: productive skin Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- AUTHORS 21 Nov 2005 22:53:14 -0000 1.166 +++ AUTHORS 24 Nov 2005 11:51:16 -0000 1.167 @@ -996,3 +996,6 @@ Wilamowski, Franciszek (Xenomorph) <higgs(a)hoth.amu.edu.pl> * Abyss, Blue, Blue-small + +Zeising, Michael <michael(a)michaels-website.de> + * productive

1 0