From 9c8aabceba890bd2b969b427ccd70db6f89245ca Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 27 May 2005 11:12:35 +0200 Subject: [PATCH] --- yaml --- r: 1607 b: refs/heads/master c: bfc5bddb8efb7e3d10e2f2e07dc2d68e808a9c68 h: refs/heads/master i: 1605: 16be7abe046e4ad38530afea3b1b66553f56e781 1603: 41b890878afc8fb27c06e74fccc24867b5128caa 1599: 0c9bf76477ec51b63e15f56a1120243123ee585e v: v3 --- [refs] | 2 +- trunk/sound/core/oss/pcm_oss.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 722d96b62293..18eca42c2963 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdc27f3a3fad42f797d4112719d8455fda78c2df +refs/heads/master: bfc5bddb8efb7e3d10e2f2e07dc2d68e808a9c68 diff --git a/trunk/sound/core/oss/pcm_oss.c b/trunk/sound/core/oss/pcm_oss.c index a293982bdd21..b9deef9179a0 100644 --- a/trunk/sound/core/oss/pcm_oss.c +++ b/trunk/sound/core/oss/pcm_oss.c @@ -126,10 +126,10 @@ static long snd_pcm_oss_bytes(snd_pcm_substream_t *substream, long frames) { snd_pcm_runtime_t *runtime = substream->runtime; snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream); - frames = frames_to_bytes(runtime, frames); + long bytes = frames_to_bytes(runtime, frames); if (buffer_size == runtime->oss.buffer_bytes) - return frames; - return (long)(((int64_t)runtime->oss.buffer_bytes * (int64_t)frames) / (int64_t)buffer_size); + return bytes; + return (long)(((int64_t)runtime->oss.buffer_bytes * (int64_t)bytes) / (int64_t)buffer_size); } static long snd_pcm_alsa_frames(snd_pcm_substream_t *substream, long bytes)