From 24d30ff306a906b21ad724c07a95caed24659887 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 10:29:53 -0800
Subject: audio: work to get alsa support in, lets see if this works before
 adding more

---
 gr-audio/lib/gr-audio.conf | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 gr-audio/lib/gr-audio.conf

(limited to 'gr-audio/lib/gr-audio.conf')

diff --git a/gr-audio/lib/gr-audio.conf b/gr-audio/lib/gr-audio.conf
new file mode 100644
index 000000000..a79413d1a
--- /dev/null
+++ b/gr-audio/lib/gr-audio.conf
@@ -0,0 +1,3 @@
+# This file contains system wide configuration data for GNU Radio.
+# You may override any setting on a per-user basis by editing
+# ~/.gnuradio/config.conf
-- 
cgit 


From 0ac77af7db957f8746282b60d57e04d65f7d9054 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 12:31:28 -0800
Subject: audio: use conf files to specify default arch

---
 gr-audio/lib/gr-audio.conf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gr-audio/lib/gr-audio.conf')

diff --git a/gr-audio/lib/gr-audio.conf b/gr-audio/lib/gr-audio.conf
index a79413d1a..cf3d6db11 100644
--- a/gr-audio/lib/gr-audio.conf
+++ b/gr-audio/lib/gr-audio.conf
@@ -1,3 +1,7 @@
 # This file contains system wide configuration data for GNU Radio.
 # You may override any setting on a per-user basis by editing
 # ~/.gnuradio/config.conf
+
+[audio]
+
+#default_arch = alsa
-- 
cgit 


From e2c5a9ff423aaf2b86faac6bb39a8724fdc2aac8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 14 Mar 2011 10:17:02 -0700
Subject: gr-audio: added README and default config fix

---
 gr-audio/lib/gr-audio.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-audio/lib/gr-audio.conf')

diff --git a/gr-audio/lib/gr-audio.conf b/gr-audio/lib/gr-audio.conf
index cf3d6db11..9a7007656 100644
--- a/gr-audio/lib/gr-audio.conf
+++ b/gr-audio/lib/gr-audio.conf
@@ -4,4 +4,4 @@
 
 [audio]
 
-#default_arch = alsa
+audio_module = auto
-- 
cgit 


From 34313eace681a82e230c38a8cd26c0001ee823ea Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 22 Mar 2011 09:34:53 -0700
Subject: audio: moved audio docs to gr-audio and fix comments

---
 gr-audio/lib/gr-audio.conf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gr-audio/lib/gr-audio.conf')

diff --git a/gr-audio/lib/gr-audio.conf b/gr-audio/lib/gr-audio.conf
index 9a7007656..e0d9221c3 100644
--- a/gr-audio/lib/gr-audio.conf
+++ b/gr-audio/lib/gr-audio.conf
@@ -2,6 +2,11 @@
 # You may override any setting on a per-user basis by editing
 # ~/.gnuradio/config.conf
 
+# specify which audio module to load, or use "auto" to have the system
+# select one.  Valid choices depend on your OS and which modules
+# you've installed, but typically include:
+# auto, alsa, oss, portaudio, jack, osx, windows
+
 [audio]
 
 audio_module = auto
-- 
cgit