[MPlayer-cvslog] r33888 - in trunk: Makefile gui/win32/playlist.c gui/win32/playlist.h

[Diego Biurrun]

On Fri, Jul 22, 2011 at 12:24:57AM +0200, diego wrote:
> 
> Log:
> foo

Sorry, I'm a complete retard and just accidentally pushed random and
unfinished nonsense from my git-svn tree.  Apologies for being tired
and negligent.

Anyway, since it's already in, we might as well review quickly instead
of ripping out and adding back...

> --- trunk/Makefile	Thu Jul 21 03:21:36 2011	(r33887)
> +++ trunk/Makefile	Fri Jul 22 00:24:57 2011	(r33888)
> @@ -720,20 +720,14 @@ DIRS =  . \
>          libao2 \
> -        libass \
> -        libdvdcss \
> -        libdvdnav \
> -        libdvdnav/vm \
> -        libdvdread4 \
>          libmenu \
>          libmpcodecs \
>          libmpcodecs/native \
>          libmpdemux \
> -        libmpeg2 \
>          libvo \
>          loader \
> -        loader/dshow \
>          loader/dmo \
> +        loader/dshow \
>          loader/wine \
> @@ -742,14 +736,22 @@ DIRS =  . \
>          sub \
> -        tremor \
>          TOOLS \
>          vidix \
>  
> +ALL_DIRS = $(DIRS) \
> +        libass \
> +        libdvdcss \
> +        libdvdnav \
> +        libdvdnav/vm \
> +        libdvdread4 \
> +        libmpeg2 \
> +        tremor \
> +
>  ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
>  
>  ADDSUFFIXES     = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
> -ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1),$(DIRS))
> +ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1),$(ALL_DIRS))
>  ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))

This I will just keep, it does not really hurt.

> --- trunk/gui/win32/playlist.c	Thu Jul 21 03:21:36 2011	(r33887)
> +++ trunk/gui/win32/playlist.c	Fri Jul 22 00:24:57 2011	(r33888)
> @@ -22,6 +22,7 @@
>  
>  #include <windows.h>
> +#include <stdbool.h>
>  #include <stdio.h>
> @@ -29,7 +30,7 @@
>  
> -BOOL adddirtoplaylist(playlist_t *playlist, const char *path, BOOL recursive)
> +bool adddirtoplaylist(playlist_t *playlist, const char *path, bool recursive)
>  {
>      HANDLE findHandle = INVALID_HANDLE_VALUE;
> --- trunk/gui/win32/playlist.h	Thu Jul 21 03:21:36 2011	(r33887)
> +++ trunk/gui/win32/playlist.h	Fri Jul 22 00:24:57 2011	(r33888)
> @@ -24,7 +24,7 @@
>  
> -#include <windows.h>
> +#include <stdbool.h>
>  
> @@ -56,6 +56,6 @@ struct playlist_t
>  
>  playlist_t *create_playlist(void);
> -BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
> +bool adddirtoplaylist(playlist_t *playlist, const char* path, bool recursive);

Ingo, can you confirm this is OK or not?

Diego