r4521 - in packages/trunk/a7xpg/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2007-11-01 19:54:14 +0000 (Thu, 01 Nov 2007)
New Revision: 4521

Added:
   packages/trunk/a7xpg/debian/patches/allow-sound-init-to-fail.patch
Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/patches/series
Log:
Don't abort if the audio device couldn't be opened.


Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog	2007-11-01 19:53:15 UTC (rev 4520)
+++ packages/trunk/a7xpg/debian/changelog	2007-11-01 19:54:14 UTC (rev 4521)
@@ -1,3 +1,9 @@
+a7xpg (0.11.dfsg1-3) UNRELEASED; urgency=low
+
+  * Don't abort if the audio device couldn't be opened. (Closes: #448786)
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Thu, 01 Nov 2007 20:48:26 +0100
+
 a7xpg (0.11.dfsg1-2) unstable; urgency=low
 
   [Miriam Ruiz]

Added: packages/trunk/a7xpg/debian/patches/allow-sound-init-to-fail.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/allow-sound-init-to-fail.patch	                        (rev 0)
+++ packages/trunk/a7xpg/debian/patches/allow-sound-init-to-fail.patch	2007-11-01 19:54:14 UTC (rev 4521)
@@ -0,0 +1,32 @@
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Sound.d	2007-11-01 20:44:09.000000000 +0100
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d	2007-11-01 20:45:41.000000000 +0100
+@@ -9,6 +9,7 @@
+ import SDL;
+ import SDL_mixer;
+ import abagames.util.sdl.SDLInitFailedException;
++import std.cstream;
+ 
+ /**
+  * BGM/SE.
+@@ -30,8 +31,7 @@
+ 
+     if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
+       noSound = 1;
+-      throw new SDLInitFailedException
+-	("Unable to initialize SDL_AUDIO: " ~ string.toString(SDL_GetError()));
++      derr.writeLine("Unable to initialize SDL audio: " ~ string.toString(SDL_GetError()));
+     }
+ 
+     audio_rate = 44100;
+@@ -40,8 +40,7 @@
+     audio_buffers = 4096;
+     if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) < 0) {
+       noSound = 1;
+-      throw new SDLInitFailedException
+-	("Couldn't open audio: " ~ string.toString(SDL_GetError()));
++      derr.writeLine("Couldn't open audio: " ~ string.toString(SDL_GetError()));
+     }
+     Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
+   }

Modified: packages/trunk/a7xpg/debian/patches/series
===================================================================
--- packages/trunk/a7xpg/debian/patches/series	2007-11-01 19:53:15 UTC (rev 4520)
+++ packages/trunk/a7xpg/debian/patches/series	2007-11-01 19:54:14 UTC (rev 4521)
@@ -10,3 +10,4 @@
 windowed.patch
 makefile.patch
 window-resizing.patch
+allow-sound-init-to-fail.patch