Prepare for changing audio_pcm_ops dynamically (partially revert r5422)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5435 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
9366f41860
commit
35f4b58c7a
|
@ -917,7 +917,7 @@ static struct audio_option alsa_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops alsa_pcm_ops = {
|
static struct audio_pcm_ops alsa_pcm_ops = {
|
||||||
alsa_init_out,
|
alsa_init_out,
|
||||||
alsa_fini_out,
|
alsa_fini_out,
|
||||||
alsa_run_out,
|
alsa_run_out,
|
||||||
|
|
|
@ -81,7 +81,7 @@ typedef struct HWVoiceOut {
|
||||||
int samples;
|
int samples;
|
||||||
LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
|
LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
|
||||||
LIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
|
LIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
|
||||||
const struct audio_pcm_ops *pcm_ops;
|
struct audio_pcm_ops *pcm_ops;
|
||||||
LIST_ENTRY (HWVoiceOut) entries;
|
LIST_ENTRY (HWVoiceOut) entries;
|
||||||
} HWVoiceOut;
|
} HWVoiceOut;
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ typedef struct HWVoiceIn {
|
||||||
|
|
||||||
int samples;
|
int samples;
|
||||||
LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
|
LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
|
||||||
const struct audio_pcm_ops *pcm_ops;
|
struct audio_pcm_ops *pcm_ops;
|
||||||
LIST_ENTRY (HWVoiceIn) entries;
|
LIST_ENTRY (HWVoiceIn) entries;
|
||||||
} HWVoiceIn;
|
} HWVoiceIn;
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ struct audio_driver {
|
||||||
struct audio_option *options;
|
struct audio_option *options;
|
||||||
void *(*init) (void);
|
void *(*init) (void);
|
||||||
void (*fini) (void *);
|
void (*fini) (void *);
|
||||||
const struct audio_pcm_ops *pcm_ops;
|
struct audio_pcm_ops *pcm_ops;
|
||||||
int can_be_default;
|
int can_be_default;
|
||||||
int max_voices_out;
|
int max_voices_out;
|
||||||
int max_voices_in;
|
int max_voices_in;
|
||||||
|
|
|
@ -520,7 +520,7 @@ static struct audio_option coreaudio_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops coreaudio_pcm_ops = {
|
static struct audio_pcm_ops coreaudio_pcm_ops = {
|
||||||
coreaudio_init_out,
|
coreaudio_init_out,
|
||||||
coreaudio_fini_out,
|
coreaudio_fini_out,
|
||||||
coreaudio_run_out,
|
coreaudio_run_out,
|
||||||
|
|
|
@ -1057,7 +1057,7 @@ static struct audio_option dsound_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops dsound_pcm_ops = {
|
static struct audio_pcm_ops dsound_pcm_ops = {
|
||||||
dsound_init_out,
|
dsound_init_out,
|
||||||
dsound_fini_out,
|
dsound_fini_out,
|
||||||
dsound_run_out,
|
dsound_run_out,
|
||||||
|
|
|
@ -566,7 +566,7 @@ struct audio_option qesd_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops qesd_pcm_ops = {
|
static struct audio_pcm_ops qesd_pcm_ops = {
|
||||||
qesd_init_out,
|
qesd_init_out,
|
||||||
qesd_fini_out,
|
qesd_fini_out,
|
||||||
qesd_run_out,
|
qesd_run_out,
|
||||||
|
|
|
@ -657,7 +657,7 @@ static struct audio_option fmod_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops fmod_pcm_ops = {
|
static struct audio_pcm_ops fmod_pcm_ops = {
|
||||||
fmod_init_out,
|
fmod_init_out,
|
||||||
fmod_fini_out,
|
fmod_fini_out,
|
||||||
fmod_run_out,
|
fmod_run_out,
|
||||||
|
|
|
@ -145,7 +145,7 @@ static void no_audio_fini (void *opaque)
|
||||||
(void) opaque;
|
(void) opaque;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct audio_pcm_ops no_pcm_ops = {
|
static struct audio_pcm_ops no_pcm_ops = {
|
||||||
no_init_out,
|
no_init_out,
|
||||||
no_fini_out,
|
no_fini_out,
|
||||||
no_run_out,
|
no_run_out,
|
||||||
|
|
|
@ -751,7 +751,7 @@ static struct audio_option oss_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops oss_pcm_ops = {
|
static struct audio_pcm_ops oss_pcm_ops = {
|
||||||
oss_init_out,
|
oss_init_out,
|
||||||
oss_fini_out,
|
oss_fini_out,
|
||||||
oss_run_out,
|
oss_run_out,
|
||||||
|
|
|
@ -487,7 +487,7 @@ struct audio_option qpa_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops qpa_pcm_ops = {
|
static struct audio_pcm_ops qpa_pcm_ops = {
|
||||||
qpa_init_out,
|
qpa_init_out,
|
||||||
qpa_fini_out,
|
qpa_fini_out,
|
||||||
qpa_run_out,
|
qpa_run_out,
|
||||||
|
|
|
@ -423,7 +423,7 @@ static struct audio_option sdl_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops sdl_pcm_ops = {
|
static struct audio_pcm_ops sdl_pcm_ops = {
|
||||||
sdl_init_out,
|
sdl_init_out,
|
||||||
sdl_fini_out,
|
sdl_fini_out,
|
||||||
sdl_run_out,
|
sdl_run_out,
|
||||||
|
|
|
@ -233,7 +233,7 @@ static struct audio_option wav_options[] = {
|
||||||
{NULL, 0, NULL, NULL, NULL, 0}
|
{NULL, 0, NULL, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct audio_pcm_ops wav_pcm_ops = {
|
static struct audio_pcm_ops wav_pcm_ops = {
|
||||||
wav_init_out,
|
wav_init_out,
|
||||||
wav_fini_out,
|
wav_fini_out,
|
||||||
wav_run_out,
|
wav_run_out,
|
||||||
|
|
Loading…
Reference in New Issue