From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 13 Mar 2014 21:33:39 +0000 (+0000)
Subject: Better formatting of error messages from ALSA drivers.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3d9e6fec559e1002ae68c0096094a9cf1d62bd2f;p=freetel-svn-tracking.git

Better formatting of error messages from ALSA drivers.


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

diff --git a/freedv-server/source/platform/linux/audio_in_alsa.cpp b/freedv-server/source/platform/linux/audio_in_alsa.cpp
index 6d084110..9c7741b4 100644
--- a/freedv-server/source/platform/linux/audio_in_alsa.cpp
+++ b/freedv-server/source/platform/linux/audio_in_alsa.cpp
@@ -81,7 +81,7 @@ namespace FreeDV {
     if ( result == -EPIPE ) {
       snd_pcm_recover(handle, result, 1);
       result = snd_pcm_readi(handle, array, length);
-      std::cerr << "ALSA input " << parameters << ": read underrun." << std::endl;
+      std::cerr << "ALSA input \"" << parameters << "\": read underrun." << std::endl;
       if ( result == -EPIPE )
         return 0;
     }
@@ -133,7 +133,7 @@ namespace FreeDV {
 
       error = snd_pcm_avail_delay(handle, &available, &delay);
 
-      std::cerr << "ALSA input " << parameters << ": overlong delay, dropped "
+      std::cerr << "ALSA input \"" << parameters << "\": overlong delay, dropped "
        << seconds << " seconds of queued audio samples." << std::endl;
 
       return 0;
@@ -142,7 +142,7 @@ namespace FreeDV {
     if ( error == -EPIPE ) {
       snd_pcm_recover(handle, error, 1);
       available = snd_pcm_avail_delay(handle, &available, &delay);
-      std::cerr << "ALSA input " << parameters << ": ready underrun." << std::endl;
+      std::cerr << "ALSA input \"" << parameters << "\": ready underrun." << std::endl;
     }
 
     if ( error >= 0 )
diff --git a/freedv-server/source/platform/linux/audio_out_alsa.cpp b/freedv-server/source/platform/linux/audio_out_alsa.cpp
index 5931e11d..3cf78946 100644
--- a/freedv-server/source/platform/linux/audio_out_alsa.cpp
+++ b/freedv-server/source/platform/linux/audio_out_alsa.cpp
@@ -79,7 +79,7 @@ namespace FreeDV {
     int error = snd_pcm_writei(handle, array, length);
     started = true;
     if ( error == -EPIPE ) {
-      std::cerr << "ALSA output " << parameters << ": write underrun." << std::endl;
+      std::cerr << "ALSA output \"" << parameters << "\": write underrun." << std::endl;
       snd_pcm_recover(handle, error, 1);
       error = snd_pcm_writei(handle, array, length);
     }
@@ -117,7 +117,7 @@ namespace FreeDV {
     error = snd_pcm_avail_delay(handle, &available, &delay);
 
     if ( error == -EPIPE ) {
-      std::cerr << "ALSA output " << parameters << ": ready underrun." << std::endl;
+      std::cerr << "ALSA output \"" << parameters << "\": ready underrun." << std::endl;
       snd_pcm_recover(handle, error, 1);
       snd_pcm_pause(handle, 1);
       started = false;