|
@@ -306,19 +306,6 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void params_change_substream(struct loopback_pcm *dpcm,
|
|
|
- struct snd_pcm_runtime *runtime)
|
|
|
-{
|
|
|
- struct snd_pcm_runtime *dst_runtime;
|
|
|
-
|
|
|
- if (dpcm == NULL || dpcm->substream == NULL)
|
|
|
- return;
|
|
|
- dst_runtime = dpcm->substream->runtime;
|
|
|
- if (dst_runtime == NULL)
|
|
|
- return;
|
|
|
- dst_runtime->hw = dpcm->cable->hw;
|
|
|
-}
|
|
|
-
|
|
|
static void params_change(struct snd_pcm_substream *substream)
|
|
|
{
|
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
@@ -330,10 +317,6 @@ static void params_change(struct snd_pcm_substream *substream)
|
|
|
cable->hw.rate_max = runtime->rate;
|
|
|
cable->hw.channels_min = runtime->channels;
|
|
|
cable->hw.channels_max = runtime->channels;
|
|
|
- params_change_substream(cable->streams[SNDRV_PCM_STREAM_PLAYBACK],
|
|
|
- runtime);
|
|
|
- params_change_substream(cable->streams[SNDRV_PCM_STREAM_CAPTURE],
|
|
|
- runtime);
|
|
|
}
|
|
|
|
|
|
static int loopback_prepare(struct snd_pcm_substream *substream)
|
|
@@ -621,24 +604,29 @@ static unsigned int get_cable_index(struct snd_pcm_substream *substream)
|
|
|
static int rule_format(struct snd_pcm_hw_params *params,
|
|
|
struct snd_pcm_hw_rule *rule)
|
|
|
{
|
|
|
-
|
|
|
- struct snd_pcm_hardware *hw = rule->private;
|
|
|
+ struct loopback_pcm *dpcm = rule->private;
|
|
|
+ struct loopback_cable *cable = dpcm->cable;
|
|
|
struct snd_mask m;
|
|
|
|
|
|
snd_mask_none(&m);
|
|
|
- m.bits[0] = (u_int32_t)hw->formats;
|
|
|
- m.bits[1] = (u_int32_t)(hw->formats >> 32);
|
|
|
+ mutex_lock(&dpcm->loopback->cable_lock);
|
|
|
+ m.bits[0] = (u_int32_t)cable->hw.formats;
|
|
|
+ m.bits[1] = (u_int32_t)(cable->hw.formats >> 32);
|
|
|
+ mutex_unlock(&dpcm->loopback->cable_lock);
|
|
|
return snd_mask_refine(hw_param_mask(params, rule->var), &m);
|
|
|
}
|
|
|
|
|
|
static int rule_rate(struct snd_pcm_hw_params *params,
|
|
|
struct snd_pcm_hw_rule *rule)
|
|
|
{
|
|
|
- struct snd_pcm_hardware *hw = rule->private;
|
|
|
+ struct loopback_pcm *dpcm = rule->private;
|
|
|
+ struct loopback_cable *cable = dpcm->cable;
|
|
|
struct snd_interval t;
|
|
|
|
|
|
- t.min = hw->rate_min;
|
|
|
- t.max = hw->rate_max;
|
|
|
+ mutex_lock(&dpcm->loopback->cable_lock);
|
|
|
+ t.min = cable->hw.rate_min;
|
|
|
+ t.max = cable->hw.rate_max;
|
|
|
+ mutex_unlock(&dpcm->loopback->cable_lock);
|
|
|
t.openmin = t.openmax = 0;
|
|
|
t.integer = 0;
|
|
|
return snd_interval_refine(hw_param_interval(params, rule->var), &t);
|
|
@@ -647,11 +635,14 @@ static int rule_rate(struct snd_pcm_hw_params *params,
|
|
|
static int rule_channels(struct snd_pcm_hw_params *params,
|
|
|
struct snd_pcm_hw_rule *rule)
|
|
|
{
|
|
|
- struct snd_pcm_hardware *hw = rule->private;
|
|
|
+ struct loopback_pcm *dpcm = rule->private;
|
|
|
+ struct loopback_cable *cable = dpcm->cable;
|
|
|
struct snd_interval t;
|
|
|
|
|
|
- t.min = hw->channels_min;
|
|
|
- t.max = hw->channels_max;
|
|
|
+ mutex_lock(&dpcm->loopback->cable_lock);
|
|
|
+ t.min = cable->hw.channels_min;
|
|
|
+ t.max = cable->hw.channels_max;
|
|
|
+ mutex_unlock(&dpcm->loopback->cable_lock);
|
|
|
t.openmin = t.openmax = 0;
|
|
|
t.integer = 0;
|
|
|
return snd_interval_refine(hw_param_interval(params, rule->var), &t);
|
|
@@ -716,19 +707,19 @@ static int loopback_open(struct snd_pcm_substream *substream)
|
|
|
/* are cached -> they do not reflect the actual state */
|
|
|
err = snd_pcm_hw_rule_add(runtime, 0,
|
|
|
SNDRV_PCM_HW_PARAM_FORMAT,
|
|
|
- rule_format, &runtime->hw,
|
|
|
+ rule_format, dpcm,
|
|
|
SNDRV_PCM_HW_PARAM_FORMAT, -1);
|
|
|
if (err < 0)
|
|
|
goto unlock;
|
|
|
err = snd_pcm_hw_rule_add(runtime, 0,
|
|
|
SNDRV_PCM_HW_PARAM_RATE,
|
|
|
- rule_rate, &runtime->hw,
|
|
|
+ rule_rate, dpcm,
|
|
|
SNDRV_PCM_HW_PARAM_RATE, -1);
|
|
|
if (err < 0)
|
|
|
goto unlock;
|
|
|
err = snd_pcm_hw_rule_add(runtime, 0,
|
|
|
SNDRV_PCM_HW_PARAM_CHANNELS,
|
|
|
- rule_channels, &runtime->hw,
|
|
|
+ rule_channels, dpcm,
|
|
|
SNDRV_PCM_HW_PARAM_CHANNELS, -1);
|
|
|
if (err < 0)
|
|
|
goto unlock;
|