[Spice-devel] [PATCH 02/16] worker: fix RED_STREAM_TIMOUT macro spelling

[Frediano Ziglio]

> 
> On Tue, Nov 10, 2015 at 3:16 PM, Frediano Ziglio <fziglio at redhat.com> wrote:
> > From: Marc-André Lureau <marcandre.lureau at gmail.com>
> >
> > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > ---
> >  server/red_worker.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/server/red_worker.c b/server/red_worker.c
> > index 6138781..d73d616 100644
> > --- a/server/red_worker.c
> > +++ b/server/red_worker.c
> > @@ -82,7 +82,7 @@
> >
> >  #define RED_STREAM_DETACTION_MAX_DELTA ((1000 * 1000 * 1000) / 5) // 1/5
> >  sec
> >  #define RED_STREAM_CONTINUS_MAX_DELTA (1000 * 1000 * 1000)
> > -#define RED_STREAM_TIMOUT (1000 * 1000 * 1000)
> > +#define RED_STREAM_TIMEOUT (1000 * 1000 * 1000)
> >  #define RED_STREAM_FRAMES_START_CONDITION 20
> >  #define RED_STREAM_GRADUAL_FRAMES_START_CONDITION 0.2
> >  #define RED_STREAM_FRAMES_RESET_CONDITION 100
> > @@ -1924,7 +1924,7 @@ static inline unsigned int
> > red_get_streams_timout(RedWorker *worker)
> >          Stream *stream;
> >
> >          stream = SPICE_CONTAINEROF(item, Stream, link);
> > -        red_time_t delta = (stream->last_time + RED_STREAM_TIMOUT) - now;
> > +        red_time_t delta = (stream->last_time + RED_STREAM_TIMEOUT) - now;
> >
> >          if (delta < 1000 * 1000) {
> >              return 0;
> > @@ -1944,7 +1944,7 @@ static inline void
> > red_handle_streams_timout(RedWorker *worker)
> >      while (item) {
> >          Stream *stream = SPICE_CONTAINEROF(item, Stream, link);
> >          item = ring_next(ring, item);
> > -        if (now >= (stream->last_time + RED_STREAM_TIMOUT)) {
> > +        if (now >= (stream->last_time + RED_STREAM_TIMEOUT)) {
> >              red_detach_stream_gracefully(worker, stream, NULL);
> >              red_stop_stream(worker, stream);
> >          }
> > --
> > 2.4.3
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> ACK!
> 

Merged

Frediano