diff options
| author | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
| commit | 8017301de5207b49e6353c26bb5d98eceaf5db01 (patch) | |
| tree | 07854a499d68b62c7ef700cba9b0e2ff8743c984 /src/timer.c | |
| parent | 496f70fc0d717719a6defb645918785381efa22b (diff) | |
| parent | 46528783ef07d1180d7059f3916d277a2f9a0c31 (diff) | |
| download | mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.gz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.xz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to '')
| -rw-r--r-- | src/timer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/timer.c b/src/timer.c index 2d9550706..9a3228465 100644 --- a/src/timer.c +++ b/src/timer.c @@ -31,9 +31,9 @@ struct timer *timer_new(const struct audio_format *af) { struct timer *timer = g_new(struct timer, 1); - timer->time = 0; - timer->started = 0; - timer->rate = af->sample_rate * audio_format_frame_size(af); + timer->time = 0; // us + timer->started = 0; // false + timer->rate = af->sample_rate * audio_format_frame_size(af); // samples per second return timer; } @@ -59,6 +59,8 @@ void timer_add(struct timer *timer, int size) { assert(timer->started); + // (size samples) / (rate samples per second) = duration seconds + // duration seconds * 1000000 = duration us timer->time += ((uint64_t)size * 1000000) / timer->rate; } |