Mercurial > hg > openttd

changeset 13279:002f137c1f88 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17788) -Fix [FS#3268] (r16702): don't fail hard when no soundcard could be detected; just fall back on the null-driver
author rubidium <rubidium@openttd.org>
date Sat, 17 Oct 2009 15:15:00 +0000
parents 9b5e7a9fc04b
children 7b9b6a48f9a8
files src/music/null_m.h src/sound/allegro_s.h src/sound/null_s.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/music/null_m.h
+++ b/src/music/null_m.h
@@ -32,7 +32,7 @@
 
 class FMusicDriver_Null: public MusicDriverFactory<FMusicDriver_Null> {
 public:
-	static const int priority = 0;
+	static const int priority = 1;
 	/* virtual */ const char *GetName() { return "null"; }
 	/* virtual */ const char *GetDescription() { return "Null Music Driver"; }
 	/* virtual */ Driver *CreateInstance() { return new MusicDriver_Null(); }
--- a/src/sound/allegro_s.h
+++ b/src/sound/allegro_s.h
@@ -26,7 +26,7 @@
 
 class FSoundDriver_Allegro: public SoundDriverFactory<FSoundDriver_Allegro> {
 public:
-	static const int priority = 5;
+	static const int priority = 4;
 	/* virtual */ const char *GetName() { return "allegro"; }
 	/* virtual */ const char *GetDescription() { return "Allegro Sound Driver"; }
 	/* virtual */ Driver *CreateInstance() { return new SoundDriver_Allegro(); }
--- a/src/sound/null_s.h
+++ b/src/sound/null_s.h
@@ -24,7 +24,7 @@
 
 class FSoundDriver_Null: public SoundDriverFactory<FSoundDriver_Null> {
 public:
-	static const int priority = 0;
+	static const int priority = 1;
 	/* virtual */ const char *GetName() { return "null"; }
 	/* virtual */ const char *GetDescription() { return "Null Sound Driver"; }
 	/* virtual */ Driver *CreateInstance() { return new SoundDriver_Null(); }