Commit 1ca44225 authored by Jean-Paul Saman's avatar Jean-Paul Saman

qt4: v4l2 input no longer support audio capture. Use :input-slave=alsa:// instead.

(cherry picked from commit 9723a59803b71523d540d2070e60f2f11907d28e)
Signed-off-by: Jean-Paul Saman's avatarJean-Paul Saman <jean-paul.saman@m2x.nl>
parent 6148ec64
...@@ -1153,14 +1153,14 @@ void CaptureOpenPanel::updateMRL() ...@@ -1153,14 +1153,14 @@ void CaptureOpenPanel::updateMRL()
case V4L_DEVICE: case V4L_DEVICE:
fileList << "v4l://"; fileList << "v4l://";
mrl += " :v4l-vdev=" + v4lVideoDevice->text(); mrl += " :v4l-vdev=" + v4lVideoDevice->text();
mrl += " :v4l-adev=" + v4lAudioDevice->text(); mrl += " :input-slave=alsa://" + v4lAudioDevice->text();
mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() ); mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() );
mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() ); mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
break; break;
case V4L2_DEVICE: case V4L2_DEVICE:
fileList << "v4l2://"; fileList << "v4l2://";
mrl += " :v4l2-dev=" + v4l2VideoDevice->text(); mrl += " :v4l2-dev=" + v4l2VideoDevice->text();
mrl += " :v4l2-adev=" + v4l2AudioDevice->text(); mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() ); mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
break; break;
case JACK_DEVICE: case JACK_DEVICE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment