Magellan Linux

Contents of /trunk/openal/patches/openal-20051024-alsa_dmix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 2136 byte(s)
-import

1 --- ./openal-20051024/linux/src/arch/alsa/alsa.c 2005-03-25 11:48:23.000000000 +0100
2 +++ ./openal-modified/linux/src/arch/alsa/alsa.c 2005-09-01 16:31:45.000000000 +0200
3 @@ -58,6 +58,7 @@
4 static int (*psnd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val) = NULL;
5 static int (*psnd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val) = NULL;
6 static int (*psnd_pcm_hw_params_set_periods)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL;
7 +static int (*psnd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL;
8 static int (*psnd_pcm_hw_params_set_rate)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL;
9 static int (*psnd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL;
10 static size_t (*psnd_pcm_hw_params_sizeof)(void) = NULL;
11 @@ -143,6 +144,7 @@
12 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_format);
13 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_period_size);
14 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods);
15 + OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods_near);
16 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate);
17 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate_near);
18 OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_sizeof);
19 @@ -450,7 +452,7 @@
20 return AL_FALSE;
21 }
22
23 - err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0);
24 + err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0);
25 if (err < 0) {
26 _alDebug(ALD_MAXIMUS, __FILE__, __LINE__,
27 "set_read_alsa: %s\n", psnd_strerror(err));
28 @@ -622,7 +624,7 @@
29
30
31 /* Set number of periods. Periods used to be called fragments. */
32 - err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0);
33 + err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0);
34 if (err < 0) {
35 _alDebug(ALD_MAXIMUS, __FILE__, __LINE__,
36 "set_write_alsa: %s\n", psnd_strerror(err));
37 @@ -812,4 +814,3 @@
38
39 return(retval*chans);
40 }
41 -