From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 18 Apr 2014 19:21:25 +0000 (+0000)
Subject: Don't enumerate disconnected ALSA devices.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=b5a04b90e8c1f381863160b54b73bbce1991e707;p=freetel-svn-tracking.git

Don't enumerate disconnected ALSA devices.


git-svn-id: https://svn.code.sf.net/p/freetel/code@1506 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-server/source/platform/linux/alsa.cpp b/freedv-server/source/platform/linux/alsa.cpp
index e0c66ebe..6ff2989c 100644
--- a/freedv-server/source/platform/linux/alsa.cpp
+++ b/freedv-server/source/platform/linux/alsa.cpp
@@ -84,9 +84,11 @@ namespace FreeDV {
         if ( i )
           *i = '\0';
 
-        stream << "\"alsa:" << longname << '"';
-        error_message(stream, card_error);
-        stream << std::endl;
+        if ( card_error != -ENOENT ) {
+          stream << "\"alsa:" << longname << '"';
+          error_message(stream, card_error);
+          stream << std::endl;
+        }
   
         if ( ctl_error == 0 ) {
       	  if ( pcm_error == 0 )
diff --git a/freedv-server/source/platform/linux/ptt_evdev.cpp b/freedv-server/source/platform/linux/ptt_evdev.cpp
index f3aede69..17de634e 100644
--- a/freedv-server/source/platform/linux/ptt_evdev.cpp
+++ b/freedv-server/source/platform/linux/ptt_evdev.cpp
@@ -107,7 +107,7 @@ namespace FreeDV {
           }
         }
         if ( low >= 0 ) {
-          stream << '\"' << devices[i].name << ',' << low << '\"';
+          stream << "\"evdev:" << devices[i].name << ',' << low << '\"';
          
           if ( high > low )
             stream << " (" << low << '-' << high << ')';