We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch using arts_suspended() function to check for audio device available

SDL_artsaudio.c.diff (text/plain), 2.26 KB, created by Patrice Mandin on 2007-01-05 15:16:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Mandin

Created: 2007-01-05 15:16:12 UTC

Size: 2.26 KB

patch

obsolete

>Index: SDL_artsaudio.c
>===================================================================
>--- SDL_artsaudio.c	(revision 2911)
>+++ SDL_artsaudio.c	(working copy)
>@@ -60,6 +60,8 @@
> static int (*SDL_NAME(arts_stream_get))(arts_stream_t s, arts_parameter_t param);
> static int (*SDL_NAME(arts_write))(arts_stream_t s, const void *buffer, int count);
> static void (*SDL_NAME(arts_close_stream))(arts_stream_t s);
>+static int (*SDL_NAME(arts_suspended))(void);
>+static const char *(*SDL_NAME(arts_error_text))(int errorcode);
> 
> static struct {
> 	const char *name;
>@@ -72,6 +74,8 @@
> 	{ "arts_stream_get",	(void **)&SDL_NAME(arts_stream_get)	},
> 	{ "arts_write",		(void **)&SDL_NAME(arts_write)		},
> 	{ "arts_close_stream",	(void **)&SDL_NAME(arts_close_stream)	},
>+	{ "arts_suspended",	(void **)&SDL_NAME(arts_suspended)	},
>+	{ "arts_error_text",	(void **)&SDL_NAME(arts_error_text)	},
> };
> 
> static void UnloadARTSLibrary()
>@@ -127,14 +131,16 @@
> 		return available;
> 	}
> 	if ( SDL_NAME(arts_init)() == 0 ) {
>+		if ( SDL_NAME(arts_suspended)() ) {
> #define ARTS_CRASH_HACK	/* Play a stream so aRts doesn't crash */
> #ifdef ARTS_CRASH_HACK
>-		arts_stream_t stream2;
>-		stream2=SDL_NAME(arts_play_stream)(44100, 16, 2, "SDL");
>-		SDL_NAME(arts_write)(stream2, "", 0);
>-		SDL_NAME(arts_close_stream)(stream2);
>+			arts_stream_t stream2;
>+			stream2=SDL_NAME(arts_play_stream)(44100, 16, 2, "SDL");
>+			SDL_NAME(arts_write)(stream2, "", 0);
>+			SDL_NAME(arts_close_stream)(stream2);
> #endif
>-		available = 1;
>+			available = 1;
>+		}
> 		SDL_NAME(arts_free)();
> 	}
> 	UnloadARTSLibrary();
>@@ -255,6 +261,7 @@
> {
> 	int bits, frag_spec;
> 	Uint16 test_format, format;
>+	int error_code;
> 
> 	/* Reset the timer synchronization flag */
> 	frame_ticks = 0.0;
>@@ -292,10 +299,15 @@
> 	}
> 	spec->format = test_format;
> 
>-	if ( SDL_NAME(arts_init)() != 0 ) {
>-		SDL_SetError("Unable to initialize ARTS");
>+	error_code = SDL_NAME(arts_init)();
>+	if ( error_code != 0 ) {
>+		SDL_SetError("Unable to initialize ARTS: %s", SDL_NAME(arts_error_text)(error_code));
> 		return(-1);
> 	}
>+	if ( ! SDL_NAME(arts_suspended)() ) {
>+		SDL_SetError("ARTS can not open audio device");
>+		return(-1);
>+	}
> 	stream = SDL_NAME(arts_play_stream)(spec->freq, bits, spec->channels, "SDL");
> 
> 	/* Calculate the final parameters for this audio specification */

Actions: View | Diff

Attachments on bug 372: 186 | 548

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.