Ticket #1598: alsa-params.patch

mythtv/libs/libmyth/audiooutputalsa.cpp

@@ -48 +48 @@
     QString real_device = audiodevice;
     if (audio_passthru)
         real_device.append(":{ AES0 0x02 }");
-    
+
     err = snd_pcm_open(&pcm_handle, real_device,
-          SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); 
+                       SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
 
     if (err < 0)
-    { 
-        Error(QString("snd_pcm_open(%1): %2")
-              .arg(audiodevice).arg(snd_strerror(err)));
-        if (pcm_handle)
-            CloseDevice();
-        return false;
+    {
+        // Maybe the driver didn't like the extra parameters. Try again without
+        err = snd_pcm_open(&pcm_handle, audiodevice,
+                           SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+
+        if (err < 0)
+        {
+            Error(QString("snd_pcm_open(%1): %2")
+                  .arg(audiodevice).arg(snd_strerror(err)));
+            if (pcm_handle)
+                CloseDevice();
+            return false;
+        }
     }
 
     /* the audio fragment size was computed by using the next lower power of 2