Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69e6088 authored by Robert Rosengren's avatar Robert Rosengren Committed by Greg Kroah-Hartman
Browse files

ALSA: aloop: Mark paused device as inactive 



commit 306a4f3ca7f3c7dfa473ebd19d66e40e59d99734 upstream.

Show paused ALSA aloop device as inactive, i.e. the control
"PCM Slave Active" set as false. Notification sent upon state change.

This makes it possible for client capturing from aloop device to know if
data is expected. Without it the client expects data even if playback
is paused.

Signed-off-by: default avatarRobert Rosengren <robert.rosengren@axis.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2937092a

sound/drivers/aloop.c

+9 −3
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) 
		cable->pause |= stream;

		loopback_timer_stop(dpcm);

		spin_unlock(&cable->lock);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			loopback_active_notify(dpcm);

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

	case SNDRV_PCM_TRIGGER_RESUME:
@@ -305,6 +307,8 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) 
		cable->pause &= ~stream;

		loopback_timer_start(dpcm);

		spin_unlock(&cable->lock);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			loopback_active_notify(dpcm);

		break;

	default:

		return -EINVAL;
@@ -894,9 +898,11 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol, 
			[kcontrol->id.subdevice][kcontrol->id.device ^ 1];

	unsigned int val = 0;



	if (cable != NULL)

		val = (cable->running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ?

									1 : 0;

	if (cable != NULL) {

		unsigned int running = cable->running ^ cable->pause;



		val = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? 1 : 0;

	}

	ucontrol->value.integer.value[0] = val;

	return 0;

}