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] check return value correctly

convert2.diff (text/plain), 4.83 KB, created by george pee on 2009-07-23 14:14:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: george pee

Created: 2009-07-23 14:14:20 UTC

Size: 4.83 KB

patch

obsolete

>diff -rub SDL-1.2.13.orig/src/audio/alsa/SDL_alsa_audio.c SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.c
>--- SDL-1.2.13.orig/src/audio/alsa/SDL_alsa_audio.c	2007-12-30 22:47:57.000000000 -0600
>+++ SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.c	2009-07-23 14:36:05.000000000 -0500
>@@ -74,11 +74,11 @@
> static int (*SDL_NAME(snd_pcm_hw_params_set_access))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access);
> static int (*SDL_NAME(snd_pcm_hw_params_set_format))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
> static int (*SDL_NAME(snd_pcm_hw_params_set_channels))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
>-static int (*SDL_NAME(snd_pcm_hw_params_get_channels))(const snd_pcm_hw_params_t *params);
>-static unsigned int (*SDL_NAME(snd_pcm_hw_params_set_rate_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int *dir);
>-static snd_pcm_uframes_t (*SDL_NAME(snd_pcm_hw_params_set_period_size_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t val, int *dir);
>+static int (*SDL_NAME(snd_pcm_hw_params_set_rate_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
>+static int (*SDL_NAME(snd_pcm_hw_params_set_period_size_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir);
>+static int (*SDL_NAME(snd_pcm_hw_params_get_channels))(const snd_pcm_hw_params_t *params, unsigned int *val);
> static snd_pcm_sframes_t (*SDL_NAME(snd_pcm_hw_params_get_period_size))(const snd_pcm_hw_params_t *params);
>-static unsigned int (*SDL_NAME(snd_pcm_hw_params_set_periods_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int *dir);
>+static int (*SDL_NAME(snd_pcm_hw_params_set_periods_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
> static int (*SDL_NAME(snd_pcm_hw_params_get_periods))(snd_pcm_hw_params_t *params);
> static int (*SDL_NAME(snd_pcm_hw_params))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
> /*
>@@ -142,10 +142,6 @@
> 		retval = 0;
> 		for (i = 0; i < SDL_arraysize(alsa_functions); i++) {
> /*			*alsa_functions[i].func = SDL_LoadFunction(alsa_handle,alsa_functions[i].name);*/
>-#if HAVE_DLVSYM
>-			*alsa_functions[i].func = dlvsym(alsa_handle,alsa_functions[i].name,"ALSA_0.9");
>-			if (!*alsa_functions[i].func)
>-#endif
> 				*alsa_functions[i].func = dlsym(alsa_handle,alsa_functions[i].name);
> 			if (!*alsa_functions[i].func) {
> 				retval = -1;
>@@ -374,6 +370,9 @@
> 	snd_pcm_sw_params_t *swparams;
> 	snd_pcm_format_t     format;
> 	snd_pcm_uframes_t    frames;
>+	unsigned int         rate;
>+	unsigned int         periods;
>+	unsigned int 		 channels;
> 	Uint16               test_format;
> 
> 	/* Open the audio device */
>@@ -445,30 +444,41 @@
> 
> 	/* Set the number of channels */
> 	status = SDL_NAME(snd_pcm_hw_params_set_channels)(pcm_handle, hwparams, spec->channels);
>+	channels = spec->channels;
> 	if ( status < 0 ) {
>-		status = SDL_NAME(snd_pcm_hw_params_get_channels)(hwparams);
>-		if ( (status <= 0) || (status > 2) ) {
>+		status = SDL_NAME(snd_pcm_hw_params_get_channels)(hwparams, &channels);
>+		if ( status < 0 ) {
> 			SDL_SetError("Couldn't set audio channels");
> 			ALSA_CloseAudio(this);
> 			return(-1);
> 		}
>-		spec->channels = status;
>+		spec->channels = channels;
> 	}
> 
> 	/* Set the audio rate */
>-	status = SDL_NAME(snd_pcm_hw_params_set_rate_near)(pcm_handle, hwparams, spec->freq, NULL);
>+	rate = spec->freq;
>+
>+	status = SDL_NAME(snd_pcm_hw_params_set_rate_near)(pcm_handle, hwparams, &rate, NULL);
> 	if ( status < 0 ) {
> 		SDL_SetError("Couldn't set audio frequency: %s", SDL_NAME(snd_strerror)(status));
> 		ALSA_CloseAudio(this);
> 		return(-1);
> 	}
>-	spec->freq = status;
>+	spec->freq = rate;
> 
> 	/* Set the buffer size, in samples */
> 	frames = spec->samples;
>-	frames = SDL_NAME(snd_pcm_hw_params_set_period_size_near)(pcm_handle, hwparams, frames, NULL);
>+	status = SDL_NAME(snd_pcm_hw_params_set_period_size_near)(pcm_handle, hwparams, &frames, NULL);
>+	if ( status < 0 ) {
>+		SDL_SetError("Couldn't set audio frequency: %s", SDL_NAME(snd_strerror)(status));
>+		ALSA_CloseAudio(this);
>+		return(-1);
>+	}
>+
> 	spec->samples = frames;
>-	SDL_NAME(snd_pcm_hw_params_set_periods_near)(pcm_handle, hwparams, 2, NULL);
>+
>+	periods = 2;
>+	SDL_NAME(snd_pcm_hw_params_set_periods_near)(pcm_handle, hwparams, &periods, NULL);
> 
> 	/* "set" the hardware with the desired parameters */
> 	status = SDL_NAME(snd_pcm_hw_params)(pcm_handle, hwparams);
>diff -rub SDL-1.2.13.orig/src/audio/alsa/SDL_alsa_audio.h SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.h
>--- SDL-1.2.13.orig/src/audio/alsa/SDL_alsa_audio.h	2007-12-30 22:47:57.000000000 -0600
>+++ SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.h	2009-07-23 14:32:59.000000000 -0500
>@@ -24,8 +24,6 @@
> #ifndef _ALSA_PCM_audio_h
> #define _ALSA_PCM_audio_h
> 
>-#define ALSA_PCM_OLD_HW_PARAMS_API
>-#define ALSA_PCM_OLD_SW_PARAMS_API
> #include <alsa/asoundlib.h>
> 
> #include "../SDL_sysaudio.h"

Actions: View | Diff

Attachments on bug 745: 327 | 340 | 341

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.