From 6ee093c90761eabfc6255624000d3d8248802209 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 10 Sep 2009 03:04:26 +0200 Subject: Unexport ticks_per_sec variable. Create get_ticks_per_sec() function Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- audio/audio.c | 2 +- audio/noaudio.c | 4 ++-- audio/wavaudio.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'audio') diff --git a/audio/audio.c b/audio/audio.c index c067afb283..f247f42141 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1822,7 +1822,7 @@ static void audio_init (void) } conf.period.ticks = 1; } else { - conf.period.ticks = ticks_per_sec / conf.period.hertz; + conf.period.ticks = get_ticks_per_sec() / conf.period.hertz; } e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s); diff --git a/audio/noaudio.c b/audio/noaudio.c index 40a1a2fee0..2f25f176e2 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -53,7 +53,7 @@ static int no_run_out (HWVoiceOut *hw) now = qemu_get_clock (vm_clock); ticks = now - no->old_ticks; - bytes = (ticks * hw->info.bytes_per_second) / ticks_per_sec; + bytes = (ticks * hw->info.bytes_per_second) / get_ticks_per_sec(); bytes = audio_MIN (bytes, INT_MAX); samples = bytes >> hw->info.shift; @@ -109,7 +109,7 @@ static int no_run_in (HWVoiceIn *hw) if (dead) { int64_t now = qemu_get_clock (vm_clock); int64_t ticks = now - no->old_ticks; - int64_t bytes = (ticks * hw->info.bytes_per_second) / ticks_per_sec; + int64_t bytes = (ticks * hw->info.bytes_per_second) / get_ticks_per_sec(); no->old_ticks = now; bytes = audio_MIN (bytes, INT_MAX); diff --git a/audio/wavaudio.c b/audio/wavaudio.c index c4aa60ea88..78eb758bd6 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -54,7 +54,7 @@ static int wav_run_out (HWVoiceOut *hw) struct st_sample *src; int64_t now = qemu_get_clock (vm_clock); int64_t ticks = now - wav->old_ticks; - int64_t bytes = (ticks * hw->info.bytes_per_second) / ticks_per_sec; + int64_t bytes = (ticks * hw->info.bytes_per_second) / get_ticks_per_sec(); if (bytes > INT_MAX) { samples = INT_MAX >> hw->info.shift; -- cgit v1.2.3