diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-09-08 07:48:34 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-09-12 04:47:37 -0400 |
commit | 10f69f9e42833b82288882d10901dc86adc3e473 (patch) | |
tree | ed2767c07158e36cf2eba4127a9d986428b2e89a /sound | |
parent | f328385309f310626751c54f694641459e2d4582 (diff) |
[ALSA] pcm-oss - Add bugg-yptr option
Documentation,ALSA<-OSS emulation
Added 'buggy-ptr' proc option to switch the behavior of GETOPTR ioctl.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/oss/pcm_oss.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 1e606399d74a..a038fd8a53f3 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
@@ -1543,7 +1543,11 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str | |||
1543 | } else { | 1543 | } else { |
1544 | delay = snd_pcm_oss_bytes(substream, delay); | 1544 | delay = snd_pcm_oss_bytes(substream, delay); |
1545 | if (stream == SNDRV_PCM_STREAM_PLAYBACK) { | 1545 | if (stream == SNDRV_PCM_STREAM_PLAYBACK) { |
1546 | info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes; | 1546 | snd_pcm_oss_setup_t *setup = substream->oss.setup; |
1547 | if (setup && setup->buggyptr) | ||
1548 | info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes; | ||
1549 | else | ||
1550 | info.blocks = (delay + fixup) / runtime->oss.period_bytes; | ||
1547 | info.bytes = (runtime->oss.bytes - delay) & INT_MAX; | 1551 | info.bytes = (runtime->oss.bytes - delay) & INT_MAX; |
1548 | } else { | 1552 | } else { |
1549 | delay += fixup; | 1553 | delay += fixup; |
@@ -2350,6 +2354,8 @@ static void snd_pcm_oss_proc_write(snd_info_entry_t *entry, | |||
2350 | template.partialfrag = 1; | 2354 | template.partialfrag = 1; |
2351 | } else if (!strcmp(str, "no-silence")) { | 2355 | } else if (!strcmp(str, "no-silence")) { |
2352 | template.nosilence = 1; | 2356 | template.nosilence = 1; |
2357 | } else if (!strcmp(str, "buggy-ptr")) { | ||
2358 | template.buggyptr = 1; | ||
2353 | } | 2359 | } |
2354 | } while (*str); | 2360 | } while (*str); |
2355 | if (setup == NULL) { | 2361 | if (setup == NULL) { |