summaryrefslogtreecommitdiff
path: root/src/sound
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-06-30 12:38:18 +0000
committerrubidium <rubidium@openttd.org>2009-06-30 12:38:18 +0000
commitc29afac0a7264b7a3ab2cb3880abd5ba5ad4a8b5 (patch)
treebca01c5527e1d48a9328204fafb30339c038d254 /src/sound
parent791187cd12e0f784925c593d6ddc3e46c3f5ce1d (diff)
downloadopenttd-c29afac0a7264b7a3ab2cb3880abd5ba5ad4a8b5.tar.xz
(svn r16700) -Fix: if allegro fails to start or fails open a window or sound card fall back to another driver
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/allegro_s.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sound/allegro_s.cpp b/src/sound/allegro_s.cpp
index 977f33bc8..069e473e5 100644
--- a/src/sound/allegro_s.cpp
+++ b/src/sound/allegro_s.cpp
@@ -45,16 +45,16 @@ extern int _allegro_instance_count;
const char *SoundDriver_Allegro::Start(const char * const *parm)
{
- if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) return NULL;
+ if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) return "Failed to set up Allegro";
_allegro_instance_count++;
/* Initialise the sound */
- if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) return NULL;
+ if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) return "Failed to set up Allegro sound";
/* Okay, there's no soundcard */
if (digi_card == DIGI_NONE) {
DEBUG(driver, 0, "allegro: no sound card found");
- return NULL;
+ return "No sound card found";
}
_stream = play_audio_stream(BUFFER_SIZE, 16, true, 11025, 255, 128);