[MPlayer-cvslog] r32120 - in trunk: mencoder.c mplayer.c stream/cache2.h

[Diego Biurrun]

On Thu, Sep 09, 2010 at 10:43:19PM +0200, Reimar Döffinger wrote:
> On Thu, Sep 09, 2010 at 06:54:35PM +0200, diego wrote:
> > 
> > Log:
> > Move cache_fill_status extern declaration to cache2.h, where it belongs.
> > 
> > --- trunk/mencoder.c	Thu Sep  9 18:47:45 2010	(r32119)
> > +++ trunk/mencoder.c	Thu Sep  9 18:54:35 2010	(r32120)
> > @@ -110,12 +110,8 @@ int forced_subs_only=0;
> >  // cache2:
> >  int stream_cache_size=-1;
> >  #ifdef CONFIG_STREAM_CACHE
> > -extern int cache_fill_status;
> > -
> >  float stream_cache_min_percent=20.0;
> >  float stream_cache_seek_min_percent=50.0;
> > -#else
> > -#define cache_fill_status 0
> >  #endif
> >  
> >  int audio_id=-1;
> > 
> > Modified: trunk/mplayer.c
> > ==============================================================================
> > --- trunk/mplayer.c	Thu Sep  9 18:47:45 2010	(r32119)
> > +++ trunk/mplayer.c	Thu Sep  9 18:54:35 2010	(r32120)
> > @@ -259,8 +259,6 @@ int file_filter=1;
> >  // cache2:
> >         int stream_cache_size=-1;
> >  #ifdef CONFIG_STREAM_CACHE
> > -extern int cache_fill_status;
> > -
> >  float stream_cache_min_percent=20.0;
> >  float stream_cache_seek_min_percent=50.0;
> >  #else
> > 
> > Modified: trunk/stream/cache2.h
> > ==============================================================================
> > --- trunk/stream/cache2.h	Thu Sep  9 18:47:45 2010	(r32119)
> > +++ trunk/stream/cache2.h	Thu Sep  9 18:54:35 2010	(r32120)
> > @@ -21,6 +21,8 @@
> >  
> >  #include "stream.h"
> >  
> > +extern int cache_fill_status;
> > +
> >  void cache_uninit(stream_t *s);
> >  int cache_do_control(stream_t *stream, int cmd, void *arg);
> 
> This is rather chaotic and does not quite match the commit
> message.
> In particular I think you could/should remove the #else part
> also for MPlayer, I think it is not needed.

Removed from mplayer.c as well, thanks for the reminder.

Regarding the commit message I'm not quite sure what you would suggest
instead?  Removing the definition is a sideeffect of moving the
declaration.  Well, now on second thought I could have removed it
first because it was completely bogus, but it's too late to split
the commit now.

Diego