projects / packages / alsa-lib.git / blame
| Commit | Line | Data |
|---|---|---|
| fb0ff827 PS |
1 | --- alsa-lib-1.0.8/src/pcm/pcm_dmix.c.orig 2005-01-11 18:42:49.000000000 +0100 |
| 2 | +++ alsa-lib-1.0.8/src/pcm/pcm_dmix.c 2005-05-03 14:47:10.000000000 +0200 | |
| 3 | @@ -53,12 +53,13 @@ | |
| 4 | * | |
| 5 | */ | |
| 6 | ||
| 7 | +static int shm_sum_discard(snd_pcm_direct_t *dmix); | |
| 8 | + | |
| 9 | /* | |
| 10 | * sum ring buffer shared memory area | |
| 11 | */ | |
| 12 | static int shm_sum_create_or_connect(snd_pcm_direct_t *dmix) | |
| 13 | { | |
| 14 | - static int shm_sum_discard(snd_pcm_direct_t *dmix); | |
| 15 | struct shmid_ds buf; | |
| 16 | int tmpid, err; | |
| 17 | size_t size; | |
| 773efea2 PS |
18 | @@ -244,9 +245,9 @@ |
| 19 | } while (*sum != old_sample); | |
| 20 | if (!--size) | |
| 21 | return; | |
| 22 | - ((char *)src) += src_step; | |
| 23 | - ((char *)dst) += dst_step; | |
| 24 | - ((char *)sum) += sum_step; | |
| 25 | + src = ((void *)src) + src_step; | |
| 26 | + dst = ((void *)dst) + dst_step; | |
| 27 | + sum = ((void *)sum) + sum_step; | |
| 28 | } | |
| 29 | } | |
| 30 | ||
| 31 | @@ -276,9 +277,9 @@ | |
| 32 | } while (*sum != old_sample); | |
| 33 | if (!--size) | |
| 34 | return; | |
| 35 | - ((char *)src) += src_step; | |
| 36 | - ((char *)dst) += dst_step; | |
| 37 | - ((char *)sum) += sum_step; | |
| 38 | + src = ((void *)src) + src_step; | |
| 357403a7 PS |
39 | + dst = ((void *)dst) + dst_step; |
| 40 | + sum = ((void *)sum) + sum_step; | |
| 773efea2 PS |
41 | } |
| 42 | } | |
| 43 | ||
| fb0ff827 PS |
44 | --- alsa-lib-1.0.8/src/conf.c.orig 2004-10-05 17:33:04.000000000 +0200 |
| 45 | +++ alsa-lib-1.0.8/src/conf.c 2005-05-03 14:53:20.000000000 +0200 | |
| 46 | @@ -2494,9 +2494,11 @@ | |
| 47 | * specified by \p result. | |
| 48 | * \return Zero if successful, otherwise a negative error code. | |
| 49 | */ | |
| 50 | + | |
| 51 | +static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data); | |
| 52 | + | |
| 53 | int snd_config_search_hooks(snd_config_t *config, const char *key, snd_config_t **result) | |
| 54 | { | |
| 55 | - static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data); | |
| 56 | SND_CONFIG_SEARCH(config, key, result, \ | |
| 57 | err = snd_config_hooks(config, NULL); \ | |
| 58 | if (err < 0) \ | |
| 59 | @@ -2516,7 +2518,6 @@ | |
| 60 | */ | |
| 61 | int snd_config_searcha_hooks(snd_config_t *root, snd_config_t *config, const char *key, snd_config_t **result) | |
| 62 | { | |
| 63 | - static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data); | |
| 64 | SND_CONFIG_SEARCHA(root, config, key, result, | |
| 65 | snd_config_searcha_hooks, | |
| 66 | err = snd_config_hooks(config, NULL); \ |