audio: commonize voice initialization
Move some mostly irrelevant code out of audio_init. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
176adafca7
commit
5c63d141dc
|
@ -1570,8 +1570,8 @@ static int audio_driver_init(AudioState *s, struct audio_driver *drv,
|
||||||
drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;
|
drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
audio_init_nb_voices_out(s, drv);
|
audio_init_nb_voices_out(s, drv, 1);
|
||||||
audio_init_nb_voices_in(s, drv);
|
audio_init_nb_voices_in(s, drv, 0);
|
||||||
s->drv = drv;
|
s->drv = drv;
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1774,21 +1774,6 @@ static AudioState *audio_init(Audiodev *dev, const char *name)
|
||||||
|
|
||||||
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
|
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
|
||||||
|
|
||||||
s->nb_hw_voices_out = audio_get_pdo_out(dev)->voices;
|
|
||||||
s->nb_hw_voices_in = audio_get_pdo_in(dev)->voices;
|
|
||||||
|
|
||||||
if (s->nb_hw_voices_out < 1) {
|
|
||||||
dolog ("Bogus number of playback voices %d, setting to 1\n",
|
|
||||||
s->nb_hw_voices_out);
|
|
||||||
s->nb_hw_voices_out = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (s->nb_hw_voices_in < 0) {
|
|
||||||
dolog ("Bogus number of capture voices %d, setting to 0\n",
|
|
||||||
s->nb_hw_voices_in);
|
|
||||||
s->nb_hw_voices_in = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (drvname) {
|
if (drvname) {
|
||||||
driver = audio_driver_lookup(drvname);
|
driver = audio_driver_lookup(drvname);
|
||||||
if (driver) {
|
if (driver) {
|
||||||
|
|
|
@ -37,11 +37,12 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
|
static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
|
||||||
struct audio_driver *drv)
|
struct audio_driver *drv, int min_voices)
|
||||||
{
|
{
|
||||||
int max_voices = glue (drv->max_voices_, TYPE);
|
int max_voices = glue (drv->max_voices_, TYPE);
|
||||||
size_t voice_size = glue(drv->voice_size_, TYPE);
|
size_t voice_size = glue(drv->voice_size_, TYPE);
|
||||||
|
|
||||||
|
glue (s->nb_hw_voices_, TYPE) = glue(audio_get_pdo_, TYPE)(s->dev)->voices;
|
||||||
if (glue (s->nb_hw_voices_, TYPE) > max_voices) {
|
if (glue (s->nb_hw_voices_, TYPE) > max_voices) {
|
||||||
if (!max_voices) {
|
if (!max_voices) {
|
||||||
#ifdef DAC
|
#ifdef DAC
|
||||||
|
@ -56,6 +57,12 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
|
||||||
glue (s->nb_hw_voices_, TYPE) = max_voices;
|
glue (s->nb_hw_voices_, TYPE) = max_voices;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (glue (s->nb_hw_voices_, TYPE) < min_voices) {
|
||||||
|
dolog ("Bogus number of " NAME " voices %d, setting to %d\n",
|
||||||
|
glue (s->nb_hw_voices_, TYPE),
|
||||||
|
min_voices);
|
||||||
|
}
|
||||||
|
|
||||||
if (audio_bug(__func__, !voice_size && max_voices)) {
|
if (audio_bug(__func__, !voice_size && max_voices)) {
|
||||||
dolog ("drv=`%s' voice_size=0 max_voices=%d\n",
|
dolog ("drv=`%s' voice_size=0 max_voices=%d\n",
|
||||||
drv->name, max_voices);
|
drv->name, max_voices);
|
||||||
|
|
Loading…
Reference in New Issue