[MPlayer-cvslog] r32451 - trunk/libvo/vo_dxr3.c

[Diego Biurrun]

On Fri, Oct 08, 2010 at 06:34:19PM +0200, Reimar Döffinger wrote:
> On Fri, Oct 08, 2010 at 11:00:50AM +0200, diego wrote:
> > 
> > Log:
> > cosmetics: Drop some {} from if statements to get rid of pointless #ifdefs.
> > 
> > --- trunk/libvo/vo_dxr3.c	Fri Oct  8 10:56:20 2010	(r32450)
> > +++ trunk/libvo/vo_dxr3.c	Fri Oct  8 11:00:50 2010	(r32451)
> > @@ -708,13 +708,9 @@ static void uninit(void)
> >  		overlay_release(overlay_data);
> >  
> >  #ifdef CONFIG_GUI
> > -		if (!use_gui) {
> > +		if (!use_gui)
> >  #endif
> >  			vo_x11_uninit();
> > -
> > -#ifdef CONFIG_GUI
> > -		}
> > -#endif
> >  	}
> >  #endif
> >  	if (old_vmode != -1) {
> > @@ -890,15 +886,12 @@ static int preinit(const char *arg)
> >  		/* Initialize overlay and X11 */
> >  		overlay_data = overlay_init(fd_control);
> >  #ifdef CONFIG_GUI
> > -		if (!use_gui) {
> > +		if (!use_gui)
> >  #endif
> >  			if (!vo_init()) {
> >  				mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
> >  				return -1;
> >  			}
> > -#ifdef CONFIG_GUI
> > -		}
> > -#endif
> >  	}
> >  #endif
> 
> Someone around who can actually test it?

Ask around on mplayer-users maybe?

> I suspect that the if actually needs to be removed completely to make it work at all...

You mean the "if (!use_gui)"?  Maybe we should just drop such GUI ifdefs
completely.  We cannot test them and I don't think obscure GUI features
warrant making the core code ugly.

Diego