Commit d3893a39 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

audio: add driver registry 



Add registry for audio drivers, using the existing audio_driver struct.
Make all drivers register themself.  The old list of audio_driver struct
pointers is now a list of audio driver names, specifying the priority
(aka probe order) in case no driver is explicitly asked for.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180306074053.22856-2-kraxel@redhat.com
parent a88afc64

audio/alsaaudio.c

+7 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static struct audio_pcm_ops alsa_pcm_ops = { 
    .ctl_in   = alsa_ctl_in,

};



struct audio_driver alsa_audio_driver = {

static struct audio_driver alsa_audio_driver = {

    .name           = "alsa",

    .descr          = "ALSA http://www.alsa-project.org",

    .options        = alsa_options,
@@ -1226,3 +1226,9 @@ struct audio_driver alsa_audio_driver = { 
    .voice_size_out = sizeof (ALSAVoiceOut),

    .voice_size_in  = sizeof (ALSAVoiceIn)

};



static void register_audio_alsa(void)

{

    audio_driver_register(&alsa_audio_driver);

}

type_init(register_audio_alsa);

audio/audio.c

+37 −26
Original line number Diff line number Diff line
@@ -45,15 +45,32 @@ 
   The 1st one is the one used by default, that is the reason

    that we generate the list.

*/

static struct audio_driver *drvtab[] = {

#ifdef CONFIG_SPICE

    &spice_audio_driver,

#endif

static const char *audio_prio_list[] = {

    "spice",

    CONFIG_AUDIO_DRIVERS

    &no_audio_driver,

    &wav_audio_driver

    "none",

    "wav",

};



static QLIST_HEAD(, audio_driver) audio_drivers;



void audio_driver_register(audio_driver *drv)

{

    QLIST_INSERT_HEAD(&audio_drivers, drv, next);

}



audio_driver *audio_driver_lookup(const char *name)

{

    struct audio_driver *d;



    QLIST_FOREACH(d, &audio_drivers, next) {

        if (strcmp(name, d->name) == 0) {

            return d;

        }

    }

    return NULL;

}



struct fixed_settings {

    int enabled;

    int nb_voices;
@@ -1656,11 +1673,10 @@ static void audio_pp_nb_voices (const char *typ, int nb) 


void AUD_help (void)

{

    size_t i;

    struct audio_driver *d;



    audio_process_options ("AUDIO", audio_options);

    for (i = 0; i < ARRAY_SIZE (drvtab); i++) {

        struct audio_driver *d = drvtab[i];

    QLIST_FOREACH(d, &audio_drivers, next) {

        if (d->options) {

            audio_process_options (d->name, d->options);

        }
@@ -1672,8 +1688,7 @@ void AUD_help (void) 


    printf ("Available drivers:\n");



    for (i = 0; i < ARRAY_SIZE (drvtab); i++) {

        struct audio_driver *d = drvtab[i];

    QLIST_FOREACH(d, &audio_drivers, next) {



        printf ("Name: %s\n", d->name);

        printf ("Description: %s\n", d->descr);
@@ -1807,6 +1822,7 @@ static void audio_init (void) 
    const char *drvname;

    VMChangeStateEntry *e;

    AudioState *s = &glob_audio_state;

    struct audio_driver *driver;



    if (s->drv) {

        return;
@@ -1842,32 +1858,27 @@ static void audio_init (void) 
    }



    if (drvname) {

        int found = 0;



        for (i = 0; i < ARRAY_SIZE (drvtab); i++) {

            if (!strcmp (drvname, drvtab[i]->name)) {

                done = !audio_driver_init (s, drvtab[i]);

                found = 1;

                break;

            }

        }



        if (!found) {

        driver = audio_driver_lookup(drvname);

        if (driver) {

            done = !audio_driver_init(s, driver);

        } else {

            dolog ("Unknown audio driver `%s'\n", drvname);

            dolog ("Run with -audio-help to list available drivers\n");

        }

    }



    if (!done) {

        for (i = 0; !done && i < ARRAY_SIZE (drvtab); i++) {

            if (drvtab[i]->can_be_default) {

                done = !audio_driver_init (s, drvtab[i]);

        for (i = 0; !done && i < ARRAY_SIZE(audio_prio_list); i++) {

            driver = audio_driver_lookup(audio_prio_list[i]);

            if (driver && driver->can_be_default) {

                done = !audio_driver_init(s, driver);

            }

        }

    }



    if (!done) {

        done = !audio_driver_init (s, &no_audio_driver);

        driver = audio_driver_lookup("none");

        done = !audio_driver_init(s, driver);

        assert(done);

        dolog("warning: Using timer based audio emulation\n");

    }

audio/audio_int.h

+5 −9
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct SWVoiceIn { 
    QLIST_ENTRY (SWVoiceIn) entries;

};



typedef struct audio_driver audio_driver;

struct audio_driver {

    const char *name;

    const char *descr;
@@ -154,6 +155,7 @@ struct audio_driver { 
    int voice_size_out;

    int voice_size_in;

    int ctl_caps;

    QLIST_ENTRY(audio_driver) next;

};



struct audio_pcm_ops {
@@ -203,17 +205,11 @@ struct AudioState { 
    int vm_running;

};



extern struct audio_driver no_audio_driver;

extern struct audio_driver oss_audio_driver;

extern struct audio_driver sdl_audio_driver;

extern struct audio_driver wav_audio_driver;

extern struct audio_driver alsa_audio_driver;

extern struct audio_driver coreaudio_audio_driver;

extern struct audio_driver dsound_audio_driver;

extern struct audio_driver pa_audio_driver;

extern struct audio_driver spice_audio_driver;

extern const struct mixeng_volume nominal_volume;



void audio_driver_register(audio_driver *drv);

audio_driver *audio_driver_lookup(const char *name);



void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);

void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);

audio/coreaudio.c

+7 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static struct audio_pcm_ops coreaudio_pcm_ops = { 
    .ctl_out  = coreaudio_ctl_out

};



struct audio_driver coreaudio_audio_driver = {

static struct audio_driver coreaudio_audio_driver = {

    .name           = "coreaudio",

    .descr          = "CoreAudio http://developer.apple.com/audio/coreaudio.html",

    .options        = coreaudio_options,
@@ -735,3 +735,9 @@ struct audio_driver coreaudio_audio_driver = { 
    .voice_size_out = sizeof (coreaudioVoiceOut),

    .voice_size_in  = 0

};



static void register_audio_coreaudio(void)

{

    audio_driver_register(&coreaudio_audio_driver);

}

type_init(register_audio_coreaudio);

audio/dsoundaudio.c

+7 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static struct audio_pcm_ops dsound_pcm_ops = { 
    .ctl_in   = dsound_ctl_in

};



struct audio_driver dsound_audio_driver = {

static struct audio_driver dsound_audio_driver = {

    .name           = "dsound",

    .descr          = "DirectSound http://wikipedia.org/wiki/DirectSound",

    .options        = dsound_options,
@@ -903,3 +903,9 @@ struct audio_driver dsound_audio_driver = { 
    .voice_size_out = sizeof (DSoundVoiceOut),

    .voice_size_in  = sizeof (DSoundVoiceIn)

};



static void register_audio_dsound(void)

{

    audio_driver_register(&dsound_audio_driver);

}

type_init(register_audio_dsound);