[PATCH] winepulse: Move "last_time" to a local variable.

Andrew Eikum aeikum at codeweavers.com
Thu Mar 3 13:06:19 CST 2022


Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Wed, Mar 02, 2022 at 11:31:05AM +0000, Huw Davies wrote:
> It's unused outside of pulse_timer_loop().
> 
> Signed-off-by: Huw Davies <huw at codeweavers.com>
> ---
>  dlls/winepulse.drv/pulse.c | 21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
> index 6552e4ce250..901e054f6d0 100644
> --- a/dlls/winepulse.drv/pulse.c
> +++ b/dlls/winepulse.drv/pulse.c
> @@ -65,7 +65,7 @@ struct pulse_stream
>      BYTE *local_buffer, *tmp_buffer, *peek_buffer;
>      void *locked_ptr;
>      BOOL please_quit, just_started, just_underran;
> -    pa_usec_t last_time, mmdev_period_usec;
> +    pa_usec_t mmdev_period_usec;
>  
>      INT64 clock_lastpos, clock_written;
>  
> @@ -1409,13 +1409,14 @@ static NTSTATUS pulse_timer_loop(void *args)
>      struct timer_loop_params *params = args;
>      struct pulse_stream *stream = params->stream;
>      LARGE_INTEGER delay;
> +    pa_usec_t last_time;
>      UINT32 adv_bytes;
>      int success;
>      pa_operation *o;
>  
>      pulse_lock();
>      delay.QuadPart = -stream->mmdev_period_usec * 10;
> -    pa_stream_get_time(stream->stream, &stream->last_time);
> +    pa_stream_get_time(stream->stream, &last_time);
>      pulse_unlock();
>  
>      while (!stream->please_quit)
> @@ -1439,31 +1440,31 @@ static NTSTATUS pulse_timer_loop(void *args)
>          err = pa_stream_get_time(stream->stream, &now);
>          if (err == 0)
>          {
> -            TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(stream->last_time));
> +            TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(last_time));
>              if (stream->started && (stream->dataflow == eCapture || stream->held_bytes))
>              {
>                  if(stream->just_underran)
>                  {
> -                    stream->last_time = now;
> +                    last_time = now;
>                      stream->just_started = TRUE;
>                  }
>  
>                  if (stream->just_started)
>                  {
>                      /* let it play out a period to absorb some latency and get accurate timing */
> -                    pa_usec_t diff = now - stream->last_time;
> +                    pa_usec_t diff = now - last_time;
>  
>                      if (diff > stream->mmdev_period_usec)
>                      {
>                          stream->just_started = FALSE;
> -                        stream->last_time = now;
> +                        last_time = now;
>                      }
>                  }
>                  else
>                  {
> -                    INT32 adjust = stream->last_time + stream->mmdev_period_usec - now;
> +                    INT32 adjust = last_time + stream->mmdev_period_usec - now;
>  
> -                    adv_usec = now - stream->last_time;
> +                    adv_usec = now - last_time;
>  
>                      if(adjust > ((INT32)(stream->mmdev_period_usec / 2)))
>                          adjust = stream->mmdev_period_usec / 2;
> @@ -1472,7 +1473,7 @@ static NTSTATUS pulse_timer_loop(void *args)
>  
>                      delay.QuadPart = -(stream->mmdev_period_usec + adjust) * 10;
>  
> -                    stream->last_time += stream->mmdev_period_usec;
> +                    last_time += stream->mmdev_period_usec;
>                  }
>  
>                  if (stream->dataflow == eRender)
> @@ -1492,7 +1493,7 @@ static NTSTATUS pulse_timer_loop(void *args)
>              }
>              else
>              {
> -                stream->last_time = now;
> +                last_time = now;
>                  delay.QuadPart = -stream->mmdev_period_usec * 10;
>              }
>          }
> -- 
> 2.25.1
> 
> 



More information about the wine-devel mailing list