summaryrefslogtreecommitdiff
path: root/gr-audio/lib
diff options
context:
space:
mode:
authorTom Rondeau2011-03-25 13:53:09 -0400
committerTom Rondeau2011-03-25 13:53:09 -0400
commit8cee6c5ffb0605273c8b73891851ba3f991b0622 (patch)
treea3bd421c8fddaec15484d4d653811974c8d5969a /gr-audio/lib
parent972fc99ad6984e50731ec0dd97ccfec71829139b (diff)
parent64dac6a1f62fb8484e879f0d20ee60bc02da179c (diff)
downloadgnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.tar.gz
gnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.tar.bz2
gnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.zip
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-audio/lib')
-rw-r--r--gr-audio/lib/gr-audio.conf5
1 files changed, 5 insertions, 0 deletions
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