8f46f1520c
Fixes a regression: for output_plugin.delay(), we added a method to the timer class which returns the delay in milliseconds. This fails to detect negative values, because the unsigned integer is divided by 1000, and then casted to signed.
97 lines
2.0 KiB
C
97 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 2003-2010 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "timer.h"
|
|
#include "audio_format.h"
|
|
|
|
#include <glib.h>
|
|
|
|
#include <assert.h>
|
|
#include <limits.h>
|
|
#include <sys/time.h>
|
|
#include <stddef.h>
|
|
|
|
static uint64_t now(void)
|
|
{
|
|
struct timeval tv;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
return ((uint64_t)tv.tv_sec * 1000000) + tv.tv_usec;
|
|
}
|
|
|
|
Timer *timer_new(const struct audio_format *af)
|
|
{
|
|
Timer *timer = g_new(Timer, 1);
|
|
timer->time = 0;
|
|
timer->started = 0;
|
|
timer->rate = af->sample_rate * audio_format_frame_size(af);
|
|
|
|
return timer;
|
|
}
|
|
|
|
void timer_free(Timer *timer)
|
|
{
|
|
g_free(timer);
|
|
}
|
|
|
|
void timer_start(Timer *timer)
|
|
{
|
|
timer->time = now();
|
|
timer->started = 1;
|
|
}
|
|
|
|
void timer_reset(Timer *timer)
|
|
{
|
|
timer->time = 0;
|
|
timer->started = 0;
|
|
}
|
|
|
|
void timer_add(Timer *timer, int size)
|
|
{
|
|
assert(timer->started);
|
|
|
|
timer->time += ((uint64_t)size * 1000000) / timer->rate;
|
|
}
|
|
|
|
unsigned
|
|
timer_delay(const Timer *timer)
|
|
{
|
|
int64_t delay = (int64_t)(timer->time - now()) / 1000;
|
|
if (delay < 0)
|
|
return 0;
|
|
|
|
if (delay > G_MAXINT)
|
|
delay = G_MAXINT;
|
|
|
|
return delay / 1000;
|
|
}
|
|
|
|
void timer_sync(Timer *timer)
|
|
{
|
|
int64_t sleep_duration;
|
|
|
|
assert(timer->started);
|
|
|
|
sleep_duration = timer->time - now();
|
|
if (sleep_duration > 0)
|
|
g_usleep(sleep_duration);
|
|
}
|