[MPlayer-cvslog] r18918 - in trunk: Gui/Makefile configure libvo/vo_directx.c mplayer.c

[Reimar Doeffinger]

Hello,
On Thu, Jul 06, 2006 at 03:51:31AM +0200, vayne wrote:
> +       win32/wincfg.c
> +else
>  SRCS = wm/ws.c \
>         wm/wsxdnd.c \
>         app.c \
> @@ -34,8 +44,8 @@
>         mplayer/gtk/opts.c \
>         mplayer/gtk/url.c \
>         mplayer/gtk/eq.c \
> -       mplayer/gtk/common.c \
> -
> +       mplayer/gtk/common.c


> +              wm/*.o wm/*~ \
> +              win32/*.o

I think all these lines are supposed to end with a '\' and newline so
that future patches will not have to change this line just to append a
new one.


> +#ifndef WIN32 //Allow playing movies from network drives. eg. \\Desktop\c\somemovie.avi
>        if (getcwd(cwd, PATH_MAX) != (char *)NULL)
>        {
>  	  strcat(cwd, "/");
>            // Prefix relative paths with current working directory
>            play_tree_add_bpf(playtree, cwd);
>        }      
> +#endif /* WIN32 */

This is just plain wrong. Try something like this instead:

Index: playtreeparser.c
===================================================================
--- playtreeparser.c    (revision 18910)
+++ playtreeparser.c    (working copy)
@@ -632,7 +632,7 @@
     if(fl <= 0 || strstr(pt->files[i],"://") || (strstr(pt->files[i],":\\") == pt->files[i] + 1) || (pt->files[i][0] == '/') )
       continue;
     // if the path begins with \ then prepend drive letter to it.
-    if (pt->files[i][0] == '\\') {
+    if (pt->files[i][0] == '\\' && pt->files[i][0] != '\\') {
       pt->files[i] = (char*)realloc(pt->files[i],2+fl+1);
       memmove(pt->files[i] + 2,pt->files[i],fl+1);
       memcpy(pt->files[i],bp,2);

Greetings,
Reimar Doeffinger