summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-09-10 03:04:26 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-11 10:19:52 -0500
commit0fb1b4ee37fbb454f85badd7dbb8e45e6df93978 (patch)
treef550274a05a1cd7a379f3e4d1cb7789fb2e64b8c /audio
parent3a888e8e5a0f0e0d85629a17e38e36a75ad1452f (diff)
downloadqemu-0fb1b4ee37fbb454f85badd7dbb8e45e6df93978.tar.gz
qemu-0fb1b4ee37fbb454f85badd7dbb8e45e6df93978.tar.bz2
qemu-0fb1b4ee37fbb454f85badd7dbb8e45e6df93978.zip
Unexport ticks_per_sec variable. Create get_ticks_per_sec() function
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'audio')
-rw-r--r--audio/audio.c2
-rw-r--r--audio/noaudio.c4
-rw-r--r--audio/wavaudio.c2
3 files changed, 4 insertions, 4 deletions
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;