Ticket #8267: mythtv-alsa.patch

libs/libmyth/audiooutputalsa.cpp

@@ -421 +421 @@
         return err;
     }
 
-    if ((err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size)) < 0)
-    {
-        Error(QString("Unable to get buffer size for playback: %1")
-              .arg(snd_strerror(err)));
-        return err;
-    } else {
-        VERBOSE(VB_AUDIO, QString("get_buffer_size returned %1").arg(buffer_size));
-    }
-    soundcard_buffer_size = buffer_size * audio_bytes_per_sample;
-
     /* set the period time */
     if ((err = snd_pcm_hw_params_set_period_time_near(
                     handle, params, &period_time, &dir)) < 0)
@@ -442 +432 @@
         VERBOSE(VB_AUDIO, QString("set_period_time_near returned %1").arg(period_time));
     }
 
-    if ((err = snd_pcm_hw_params_get_period_size(params, &period_size,
-                                                &dir)) < 0) {
-        Error(QString("Unable to get period size for playback: %1")
+    /* write the parameters to device */
+    if ((err = snd_pcm_hw_params(handle, params)) < 0) {
+        Error(QString("Unable to set hw params for playback: %1")
+              .arg(snd_strerror(err)));
+        return err;
+    }
+
+    if ((err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size)) < 0)
+    {
+        Error(QString("Unable to get buffer size for playback: %1")
               .arg(snd_strerror(err)));
         return err;
     } else {
-        VERBOSE(VB_AUDIO, QString("get_period_size returned %1").arg(period_size));
+        VERBOSE(VB_AUDIO, QString("get_period_size returned %1").arg(buffer_size));
     }
 
-    /* write the parameters to device */
-    if ((err = snd_pcm_hw_params(handle, params)) < 0) {
-        Error(QString("Unable to set hw params for playback: %1")
+    soundcard_buffer_size = buffer_size * audio_bytes_per_sample;
+    if ((err = snd_pcm_hw_params_get_period_size(params, &period_size,
+                                                &dir)) < 0) {
+        Error(QString("Unable to get period size for playback: %1")
               .arg(snd_strerror(err)));
         return err;
+    } else {
+        VERBOSE(VB_AUDIO, QString("get_period_size returned %1").arg(period_size));
     }
     
     /* get the current swparams */