mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More flexible audio card selection

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6258 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
malc 2009-01-09 10:46:34 +00:00
parent 6b419964d5
commit 4c9b53e3ff
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -27,7 +27,8 @@ static="no"
cross_prefix="" cross_prefix=""
cc="gcc" cc="gcc"
audio_drv_list="" audio_drv_list=""
audio_card_list="" audio_card_list="ac97 es1370 sb16"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
host_cc="gcc" host_cc="gcc"
ar="ar" ar="ar"
make="make" make="make"
@ -519,8 +520,8 @@ echo " --disable-sdl disable SDL"
echo " --enable-cocoa enable COCOA (Mac OS X only)" echo " --enable-cocoa enable COCOA (Mac OS X only)"
echo " --audio-drv-list=LIST set audio drivers list:" echo " --audio-drv-list=LIST set audio drivers list:"
echo " Available drivers: $audio_possible_drivers" echo " Available drivers: $audio_possible_drivers"
echo " --audio-card-list=LIST set list of additional emulated audio cards" echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_list]"
echo " Available cards: ac97 adlib cs4231a gus" echo " Available cards: $audio_possible_cards"
echo " --enable-mixemu enable mixer emulation" echo " --enable-mixemu enable mixer emulation"
echo " --disable-brlapi disable BrlAPI" echo " --disable-brlapi disable BrlAPI"
echo " --disable-vnc-tls disable TLS encryption for VNC server" echo " --disable-vnc-tls disable TLS encryption for VNC server"

8
vl.c
View File

@ -4266,6 +4266,8 @@ struct soundhw soundhw[] = {
{ .init_isa = pcspk_audio_init } { .init_isa = pcspk_audio_init }
}, },
#endif #endif
#ifdef CONFIG_SB16
{ {
"sb16", "sb16",
"Creative Sound Blaster 16", "Creative Sound Blaster 16",
@ -4273,6 +4275,7 @@ struct soundhw soundhw[] = {
1, 1,
{ .init_isa = SB16_init } { .init_isa = SB16_init }
}, },
#endif
#ifdef CONFIG_CS4231A #ifdef CONFIG_CS4231A
{ {
@ -4308,6 +4311,7 @@ struct soundhw soundhw[] = {
}, },
#endif #endif
#ifdef CONFIG_AC97
{ {
"ac97", "ac97",
"Intel 82801AA AC97 Audio", "Intel 82801AA AC97 Audio",
@ -4315,7 +4319,9 @@ struct soundhw soundhw[] = {
0, 0,
{ .init_pci = ac97_init } { .init_pci = ac97_init }
}, },
#endif
#ifdef CONFIG_ES1370
{ {
"es1370", "es1370",
"ENSONIQ AudioPCI ES1370", "ENSONIQ AudioPCI ES1370",
@ -4325,6 +4331,8 @@ struct soundhw soundhw[] = {
}, },
#endif #endif
#endif /* HAS_AUDIO_CHOICE */
{ NULL, NULL, 0, 0, { NULL } } { NULL, NULL, 0, 0, { NULL } }
}; };