/[openvortex]/alsa/alsa-kernel/core/pcm_lib.c
ViewVC logotype

Diff of /alsa/alsa-kernel/core/pcm_lib.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by vizard, Sat May 31 02:35:09 2003 UTC revision 1.3 by vizard, Mon Aug 11 00:06:37 2003 UTC
# Line 60  void snd_pcm_playback_silence(snd_pcm_su Line 60  void snd_pcm_playback_silence(snd_pcm_su
60                          return;                          return;
61                  snd_assert(runtime->silence_filled <= runtime->buffer_size, return);                  snd_assert(runtime->silence_filled <= runtime->buffer_size, return);
62                  noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;                  noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
63                  if (noise_dist > (snd_pcm_sframes_t) runtime->silence_threshold)                  if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
64                          return;                          return;
65                  frames = runtime->silence_threshold - noise_dist;                  frames = runtime->silence_threshold - noise_dist;
66                  if (frames > runtime->silence_size)                  if (frames > runtime->silence_size)
# Line 84  void snd_pcm_playback_silence(snd_pcm_su Line 84  void snd_pcm_playback_silence(snd_pcm_su
84                          if ((snd_pcm_sframes_t)runtime->silence_start < 0)                          if ((snd_pcm_sframes_t)runtime->silence_start < 0)
85                                  runtime->silence_start += runtime->boundary;                                  runtime->silence_start += runtime->boundary;
86                  }                  }
87                  frames = runtime->buffer_size;                  frames = runtime->buffer_size - runtime->silence_filled;
88          }          }
89          snd_assert(frames >= runtime->silence_filled, return);          snd_assert(frames <= runtime->buffer_size, return);
         frames -= runtime->silence_filled;  
90          if (frames == 0)          if (frames == 0)
91                  return;                  return;
92          ofs = (runtime->silence_start + runtime->silence_filled) % runtime->buffer_size;          ofs = (runtime->silence_start + runtime->silence_filled) % runtime->buffer_size;
# Line 1932  void snd_pcm_tick_prepare(snd_pcm_substr Line 1931  void snd_pcm_tick_prepare(snd_pcm_substr
1931                  if (runtime->silence_size >= runtime->boundary) {                  if (runtime->silence_size >= runtime->boundary) {
1932                          frames = 1;                          frames = 1;
1933                  } else if (runtime->silence_size > 0 &&                  } else if (runtime->silence_size > 0 &&
1934                      runtime->silence_filled < runtime->buffer_size) {                             runtime->silence_filled < runtime->buffer_size) {
1935                          snd_pcm_sframes_t noise_dist;                          snd_pcm_sframes_t noise_dist;
1936                          noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;                          noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
1937                          snd_assert(noise_dist <= (snd_pcm_sframes_t)runtime->silence_threshold, );                          snd_assert(noise_dist <= (snd_pcm_sframes_t)runtime->silence_threshold, );

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26