Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 749d95b410bf3bb4e88011a8139ff957 > files > 8

lastfm-player-1.3.1.0-3mdv2008.0.src.rpm

--- last.fm-1.3.0.62.orig/src/output/alsa-playback/alsaaudio.cpp
+++ last.fm-1.3.0.62/src/output/alsa-playback/alsaaudio.cpp
@@ -83,6 +83,12 @@
     int err = 0;
     m_devices.clear();
 
+    // First add the default PCM device
+    AlsaDeviceInfo dev;
+    dev.name = "Default PCM device (default)";
+    dev.device = "default";
+    m_devices.push_back( dev );
+
     if ((err = snd_card_next( &card )) != 0)
         goto getCardsFailed;
 
@@ -125,7 +131,7 @@
 
     // Each card has its own default device
     // But test, just to be sure it's there
-    AlsaDeviceInfo dev;
+    /*AlsaDeviceInfo dev;
     dev.name = QString("%1: Default Device (default:%2)").arg( cardName ).arg( card );
     dev.device = "default:" + QString::number(card);
     snd_pcm_t *test_pcm;
@@ -133,7 +139,7 @@
     if (err >= 0)
         snd_pcm_close( test_pcm );
     if (err == 0 || err == -EBUSY)
-        m_devices.push_back( dev );
+        m_devices.push_back( dev );*/
 
     snd_pcm_info_alloca( &pcm_info );
 
@@ -160,6 +166,7 @@
             continue;
         }
 
+        AlsaDeviceInfo dev;
         dev.device = QString( "hw:%1,%2" )
                 .arg( card )
                 .arg( pcm_device );