summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-23 16:58:30 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-28 07:21:52 +0100
commit62a109d9e2ce948ee75222bbb92a97669f683875 (patch)
tree55760a4a8d5c5b97e4e445f81750e53b9fa3640d /sound/usb
parentALSA: line6: Do clipping in volume / monitor manipulations (diff)
downloadlinux-62a109d9e2ce948ee75222bbb92a97669f683875.tar.xz
linux-62a109d9e2ce948ee75222bbb92a97669f683875.zip
ALSA: line6: Skip volume manipulation during silence copying
A minor optimization; while pausing, the driver just copies the zero that doesn't need any volume changes. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/line6/playback.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index cbcd97f5d629..3762a98026aa 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -234,13 +234,14 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
line6pcm->out.pos += urb_frames;
if (line6pcm->out.pos >= runtime->buffer_size)
line6pcm->out.pos -= runtime->buffer_size;
+
+ change_volume(urb_out, line6pcm->volume_playback,
+ bytes_per_frame);
} else {
memset(urb_out->transfer_buffer, 0,
urb_out->transfer_buffer_length);
}
- change_volume(urb_out, line6pcm->volume_playback, bytes_per_frame);
-
if (line6pcm->prev_fbuf != NULL) {
if (line6pcm->flags & LINE6_BITS_PCM_IMPULSE) {
create_impulse_test_signal(line6pcm, urb_out,