From 41b890878afc8fb27c06e74fccc24867b5128caa Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 27 May 2005 10:07:06 +0200 Subject: [PATCH] --- yaml --- r: 1603 b: refs/heads/master c: 8e72ab349e54da49cf3e11480581a3e6704d9553 h: refs/heads/master i: 1601: c497676e1a01b1adb113ea01b3fce36b77804829 1599: 0c9bf76477ec51b63e15f56a1120243123ee585e v: v3 --- [refs] | 2 +- trunk/sound/core/oss/pcm_oss.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f5a5748046cb..302499a2ecb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3a9cfac750d78241b5dde7d004522f687703b90 +refs/heads/master: 8e72ab349e54da49cf3e11480581a3e6704d9553 diff --git a/trunk/sound/core/oss/pcm_oss.c b/trunk/sound/core/oss/pcm_oss.c index 6f90dbb76804..a293982bdd21 100644 --- a/trunk/sound/core/oss/pcm_oss.c +++ b/trunk/sound/core/oss/pcm_oss.c @@ -124,13 +124,12 @@ int snd_pcm_plugin_append(snd_pcm_plugin_t *plugin) static long snd_pcm_oss_bytes(snd_pcm_substream_t *substream, long frames) { - long bytes = 0; snd_pcm_runtime_t *runtime = substream->runtime; snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream); - bytes = frames_to_bytes(runtime, frames); + frames = frames_to_bytes(runtime, frames); if (buffer_size == runtime->oss.buffer_bytes) - return bytes; - return (runtime->oss.buffer_bytes * frames) / buffer_size; + return frames; + return (long)(((int64_t)runtime->oss.buffer_bytes * (int64_t)frames) / (int64_t)buffer_size); } static long snd_pcm_alsa_frames(snd_pcm_substream_t *substream, long bytes)