Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv29461/Gui/mplayer Modified Files: mw.h play.c widgets.c Log Message: add uri2filename converter Index: mw.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- mw.h 11 Aug 2002 19:12:08 -0000 1.76 +++ mw.h 14 Aug 2002 12:17:04 -0000 1.77 @@ -668,20 +668,13 @@ char* str = strdup( files[f] ); plItem* item; +#ifdef USE_ICONV if ( strchr( str,'%' ) ) { - char * t = calloc( 1,strlen( str ) ); - int i,c = 0; - for ( i=0;i < strlen( str );i++ ) - if ( str[i] != '%' ) t[c++]=str[i]; - else - { - char tmp[4] = "0xXX"; -// if ( str[++i] == '%' ) { t[c++]='%'; continue; }; - tmp[2]=str[++i]; tmp[3]=str[++i]; t[c++]=(char)strtol( tmp,(char **)NULL,16 ); - } - free( str ); str=t; + char * tmp=gconvert_uri_to_filename( str ); + free( str ); str=tmp; } +#endif if(stat(str,&buf) == 0 && S_ISDIR(buf.st_mode) == 0) { /* this is not a directory so try to play it */ Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- play.c 11 Aug 2002 13:12:38 -0000 1.72 +++ play.c 14 Aug 2002 12:17:04 -0000 1.73 @@ -107,9 +107,11 @@ guiIntfStruct.TimeSec=0; guiIntfStruct.Position=0; guiIntfStruct.AudioType=0; +#ifdef USE_DVDREAD guiIntfStruct.DVD.current_title=1; guiIntfStruct.DVD.current_chapter=1; guiIntfStruct.DVD.current_angle=1; +#endif if ( !appMPlayer.subWindow.isFullScreen ) { Index: widgets.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- widgets.c 4 Aug 2002 19:23:57 -0000 1.37 +++ widgets.c 14 Aug 2002 12:17:04 -0000 1.38 @@ -29,6 +29,7 @@ #include "../../config.h" #include "../../help_mp.h" +#include "../../mp_msg.h" GtkWidget * PopUpMenu = NULL;