From c7c0b86afa255983db3def0a15e1201455ade460 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 30 Oct 2010 16:29:27 -0400
Subject: Added a check in alsa sink if error has occurred due to blocking; if
 so, it will just drop samples and not get backed up. Patch taken from Marcus
 Leech 10/29/2010.

---
 gr-audio-alsa/src/audio_alsa_sink.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-audio-alsa/src/audio_alsa_sink.h')

diff --git a/gr-audio-alsa/src/audio_alsa_sink.h b/gr-audio-alsa/src/audio_alsa_sink.h
index d4b540382..f3007f60f 100644
--- a/gr-audio-alsa/src/audio_alsa_sink.h
+++ b/gr-audio-alsa/src/audio_alsa_sink.h
@@ -83,6 +83,7 @@ class audio_alsa_sink : public gr_sync_block {
   // random stats
   int			d_nunderuns;		// count of underruns
   int			d_nsuspends;		// count of suspends
+  bool			d_ok_to_block;      // defaults to "true", controls blocking/non-block I/O
 
   void output_error_msg (const char *msg, int err);
   void bail (const char *msg, int err) throw (std::runtime_error);
-- 
cgit 


From ed4abf6f759a421bc845d9138f82df84bb4bbf96 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Mon, 6 Dec 2010 20:22:22 -0500
Subject: Adding a "change in progress" check to alsa sink.

---
 gr-audio-alsa/src/audio_alsa_sink.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-audio-alsa/src/audio_alsa_sink.h')

diff --git a/gr-audio-alsa/src/audio_alsa_sink.h b/gr-audio-alsa/src/audio_alsa_sink.h
index f3007f60f..811cc6c8c 100644
--- a/gr-audio-alsa/src/audio_alsa_sink.h
+++ b/gr-audio-alsa/src/audio_alsa_sink.h
@@ -83,6 +83,7 @@ class audio_alsa_sink : public gr_sync_block {
   // random stats
   int			d_nunderuns;		// count of underruns
   int			d_nsuspends;		// count of suspends
+  bool                  d_change_in_progress;   // Topology change in progress--used as spinlock for write_buffer
   bool			d_ok_to_block;      // defaults to "true", controls blocking/non-block I/O
 
   void output_error_msg (const char *msg, int err);
-- 
cgit 


From a8e58dba4d820e0b66d89bf05af29c381e46eef9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 22 Dec 2010 17:11:44 -0500
Subject: Reverting last change in alsa.

---
 gr-audio-alsa/src/audio_alsa_sink.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gr-audio-alsa/src/audio_alsa_sink.h')

diff --git a/gr-audio-alsa/src/audio_alsa_sink.h b/gr-audio-alsa/src/audio_alsa_sink.h
index 811cc6c8c..f3007f60f 100644
--- a/gr-audio-alsa/src/audio_alsa_sink.h
+++ b/gr-audio-alsa/src/audio_alsa_sink.h
@@ -83,7 +83,6 @@ class audio_alsa_sink : public gr_sync_block {
   // random stats
   int			d_nunderuns;		// count of underruns
   int			d_nsuspends;		// count of suspends
-  bool                  d_change_in_progress;   // Topology change in progress--used as spinlock for write_buffer
   bool			d_ok_to_block;      // defaults to "true", controls blocking/non-block I/O
 
   void output_error_msg (const char *msg, int err);
-- 
cgit