aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-10 07:06:00 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-06-01 17:08:17 +0200
commit5973c775c853e26f684de58ad28c267281aaffd6 (patch)
treea1db31a2a98ec793e396a2de72f1a8858315d7af /audio
parent317c9d54284844615b33a25834a63248bf1bfa73 (diff)
downloadexternal_qemu-5973c775c853e26f684de58ad28c267281aaffd6.zip
external_qemu-5973c775c853e26f684de58ad28c267281aaffd6.tar.gz
external_qemu-5973c775c853e26f684de58ad28c267281aaffd6.tar.bz2
qemu-timer.c: rename qemu_timer_new_scale()
Get rid of qemu_timer_new() implementation, and update all callers to use qemu_timer_new_ms() or qemu_timer_new_ns() instead. Rename qemu_new_timer_scale() to qemu_new_timer() to follow upstream conventions. Change-Id: Id2c04f8597ec5026e02f87b3e2c5507920eb688e
Diffstat (limited to 'audio')
-rw-r--r--audio/audio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/audio.c b/audio/audio.c
index 3e60c12..7acd3d7 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1198,7 +1198,7 @@ static void audio_timer (void *opaque)
AudioState *s = opaque;
#if 0
#define MAX_DIFFS 100
- int64_t now = qemu_get_clock(vm_clock);
+ int64_t now = qemu_get_clock_ms(vm_clock);
static int64_t last = 0;
static float diffs[MAX_DIFFS];
static int num_diffs;
@@ -1227,7 +1227,7 @@ static void audio_timer (void *opaque)
#endif
audio_run ("timer");
- qemu_mod_timer (s->ts, qemu_get_clock (vm_clock) + conf.period.ticks);
+ qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + conf.period.ticks);
}
@@ -1250,7 +1250,7 @@ static void audio_reset_timer (void)
AudioState *s = &glob_audio_state;
if (audio_is_timer_needed ()) {
- qemu_mod_timer (s->ts, qemu_get_clock (vm_clock) + 1);
+ qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + 1);
}
else {
qemu_del_timer (s->ts);
@@ -1964,7 +1964,7 @@ static void audio_init (void)
QLIST_INIT (&s->cap_head);
atexit (audio_atexit);
- s->ts = qemu_new_timer (vm_clock, audio_timer, s);
+ s->ts = qemu_new_timer_ns (vm_clock, audio_timer, s);
if (!s->ts) {
dolog ("Could not create audio timer\n");
return;