[MPlayer-cvslog] r33266 - in trunk/gui: cfg.c cfg.h

[Diego Biurrun]

On Fri, Apr 15, 2011 at 04:30:58PM +0200, ib wrote:
> 
> Log:
> Cosmetic: Format to MPlayer coding style.
> 
> Additionally: remove needless includes, group and sort includes, group
> and sort variables, rename gtkAOFakeSurround declaration gtkAOSurround,
> add #ifdefs to variable declarations, group statements by adding or
> removing new lines to ease reading, move assignments outside conditions,
> add parentheses, avoid mixing declaration and code, revise comments and
> add new ones.

This is a little too much, more than a little too much actually, as it
contains non-cosmetic changes.  Please refrain from such grabbag commits
in the future.

> --- trunk/gui/cfg.h	Fri Apr 15 12:58:36 2011	(r33265)
> +++ trunk/gui/cfg.h	Fri Apr 15 16:30:58 2011	(r33266)
> @@ -21,49 +21,54 @@
>  
> +#ifdef CONFIG_DXR3
> +extern char *gtkDXR3Device;
> +#endif
>  
> +#ifdef CONFIG_ALSA
> +extern char *gtkAOALSAMixer;
> +extern char *gtkAOALSAMixerChannel;
> +extern char *gtkAOALSADevice;
> +#endif
>  
> +#ifdef CONFIG_OSS_AUDIO
> +extern char *gtkAOOSSMixer;
> +extern char *gtkAOOSSMixerChannel;
> +extern char *gtkAOOSSDevice;
> +#endif
>  
> +#ifdef CONFIG_ESD
> +extern char *gtkAOESDDevice;
> +#endif
> +
> +#ifdef CONFIG_SDL
> +extern char *gtkAOSDLDriver;
> +#endif

These #ifdefs around extern declarations are unnecessary.  Not only that,
but there was an effort in the past to get rid of all of them.  You just
undid that effort, so please fix it again.

Diego