--- deliantra/Deliantra-Client/DC/Audio.pm 2012/01/18 15:31:51 1.2 +++ deliantra/Deliantra-Client/DC/Audio.pm 2013/05/01 20:38:50 1.3 @@ -19,7 +19,7 @@ our $SDL_MIXER; -sub init { +sub init() { unless ($::SDL_MIXER) { if (length $::CFG->{audio_driver}) { local $ENV{SDL_AUDIODRIVER} = $::CFG->{audio_driver}; @@ -69,24 +69,13 @@ # let's check whether the default config and a few others segfault, # then decide - # user selected config - return if _probe; - - # default sdl config - delete $ENV{SDL_AUDIODRIVER}; - $::CFG->{audio_driver} = ""; - return if _probe; - - $::CFG->{audio_driver} = "pulse"; - return if _probe; - - $::CFG->{audio_driver} = "alsa"; - return if _probe; - - $::CFG->{audio_driver} = "dsp"; - return if _probe; - - $::CFG->{audio_driver} = "none"; + return if _probe; # user selected config + $::CFG->{audio_driver} = "" ; return if _probe; # default sdl config + $::CFG->{audio_driver} = "pulse"; return if _probe; + $::CFG->{audio_driver} = "alsa" ; return if _probe; + $::CFG->{audio_driver} = "esd" ; return if _probe; + $::CFG->{audio_driver} = "dsp" ; return if _probe; + $::CFG->{audio_driver} = "none" ; } 1;