Changeset 9741adc7f in mythtv

Timestamp:

Nov 22, 2010, 4:36:37 AM (14 years ago)

Author:

Jean-Yves Avenard <jyavenard@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, devel/gpu-commflag, fixes/0.25, fixes/0.26, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

18fdd004ee

Parents:

ca3ea9c009

Message:

Simplify code when opening ALSA device and trying to setup digital passthrough. Remove unused private member in ALSA class

git-svn-id: ​http://svn.mythtv.org/svn/trunk@27317 7dbf422c-18fa-0310-86e9-fd20926502f2

Location:

mythtv/libs/libmyth

Files:

• audiooutputalsa.cpp (modified) (8 diffs)
• audiooutputalsa.h (modified) (3 diffs)

mythtv/libs/libmyth/audiooutputalsa.cpp

@@ -34 +34 @@
     AudioOutputBase(settings),
     pcm_handle(NULL),
-    numbadioctls(0),
     pbufsize(-1),
     m_card(-1),
     m_device(-1),
-    m_subdevice(-1)
+    m_subdevice(-1),
+    m_autopassthrough(false)
 {
     m_mixer.handle = NULL;
@@ -46 +46 @@
     if (passthru_device == "auto")
     {
+        m_autopassthrough = true;
         passthru_device = main_device;
 
@@ -99 +100 @@
 }
 
+int AudioOutputALSA::TryOpenDevice(int open_mode, int try_ac3)
+{
+    QString real_device;
+    QByteArray dev_ba;
+    int err = -1;
+
+    if (try_ac3)
+    {
+        dev_ba = passthru_device.toAscii();
+        err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
+                           SND_PCM_STREAM_PLAYBACK, open_mode);
+        m_lastdevice = passthru_device;
+        if (!m_autopassthrough)
+            return err;
+    }
+    if (!try_ac3 || err < 0)
+    {
+        // passthru open failed, retry default device
+        dev_ba = main_device.toAscii();
+        err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
+                           SND_PCM_STREAM_PLAYBACK, open_mode);
+        m_lastdevice = main_device;
+    }
+    return err;
+}
+
 int AudioOutputALSA::GetPCMInfo(int &card, int &device, int &subdevice)
 {
@@ -236 +263 @@
     int err;
 
-    QString real_device = (passthru || enc) ? passthru_device : main_device;
-
     AudioOutputSettings *settings = new AudioOutputSettings();
 
@@ -245 +270 @@
         pcm_handle = NULL;
     }
-    QByteArray dev_ba = real_device.toAscii();
-    if((err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
-                           SND_PCM_STREAM_PLAYBACK, OPEN_FLAGS)) < 0)
-    {
-        AERROR(QString("snd_pcm_open(\"%1\")").arg(real_device));
+
+    if((err = TryOpenDevice(OPEN_FLAGS, passthru || enc)) < 0)
+    {
+        AERROR(QString("snd_pcm_open(\"%1\")").arg(m_lastdevice));
         delete settings;
         return NULL;
@@ -259 +283 @@
     {
         snd_pcm_close(pcm_handle);
-        if((err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
-                               SND_PCM_STREAM_PLAYBACK, OPEN_FLAGS&FILTER_FLAGS
-                               )) < 0)
-        {
-            AERROR(QString("snd_pcm_open(\"%1\")").arg(real_device));
+        if((err = TryOpenDevice(OPEN_FLAGS&FILTER_FLAGS, passthru || enc)) < 0)
+        {
+            AERROR(QString("snd_pcm_open(\"%1\")").arg(m_lastdevice));
             delete settings;
             return NULL;
@@ -309 +331 @@
     while(1)
     {
+        QString real_device = (((passthru || enc) && !m_autopassthrough) ?
+                               passthru_device : main_device);
+
         QString desc = alsadevs->value(real_device);
 
@@ -346 +371 @@
     uint buffer_time, period_time;
     int err;
-    QString real_device;
 
     if (pcm_handle != NULL)
         CloseDevice();
 
-    numbadioctls = 0;
-
-    if (passthru || enc)
-    {
-        real_device = passthru_device;        
-    }
-    else
-    {
-        real_device = main_device;
-    }
-
-    QByteArray dev_ba = real_device.toAscii();
-    err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
-                       SND_PCM_STREAM_PLAYBACK, 0);
-    if ((passthru || enc) && err < 0)
-    {
-        // passthru open failed, retry default device
-        dev_ba = main_device.toAscii();
-        err = snd_pcm_open(&pcm_handle, dev_ba.constData(),
-                           SND_PCM_STREAM_PLAYBACK, 0);
-    }
-    if (err < 0)
-    {
-        AERROR(QString("snd_pcm_open(%1)").arg(real_device));
+    if ((err = TryOpenDevice(0, passthru || enc)) < 0)    
+    {
+        AERROR(QString("snd_pcm_open2(\"%1\")").arg(m_lastdevice));
         if (pcm_handle)
             CloseDevice();

mythtv/libs/libmyth/audiooutputalsa.h

@@ -32 +32 @@
 
   private:
+    int TryOpenDevice(int open_mode, int try_ac3);
     int GetPCMInfo(int &card, int &device, int &subdevice);
     bool SetPreallocBufferSize(int size);
@@ -43 +44 @@
   private:
     snd_pcm_t   *pcm_handle;
-    int          numbadioctls;
     int          pbufsize;
     int          m_card, m_device, m_subdevice;
@@ -49 +49 @@
     snd_pcm_sframes_t (*pcm_write_func)(snd_pcm_t*, const void*,
                                         snd_pcm_uframes_t);
+    bool         m_autopassthrough;
+    QString      m_lastdevice;
+
     struct {
         QString            device;