summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-02-26 20:43:18 +0000
committerRussell Bryant <russell@russellbryant.com>2007-02-26 20:43:18 +0000
commitb3776415aa688d58a80aeedabe8728f1d141d68e (patch)
treebd195db4c5f3e7a4fdbb57f98ece2aec1c354a9b /channels
parente83cff1c23267d262ca37608b185d90833e03e3a (diff)
Merged revisions 56888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r56888 | russell | 2007-02-26 14:42:21 -0600 (Mon, 26 Feb 2007) | 4 lines Restore the behavior of Asterisk 1.2 where if a device was not specified in alsa.conf, then we just use the system default, instead of creating our own default of hw:0,0. (issue #9139) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_alsa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 1651b7d4a..2be93ef9f 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -83,8 +83,8 @@ static struct ast_jb_conf global_jbconf;
#define DEBUG 0
/* Which device to use */
-#define ALSA_INDEV "hw:0,0"
-#define ALSA_OUTDEV "hw:0,0"
+#define ALSA_INDEV "default"
+#define ALSA_OUTDEV "default"
#define DESIRED_RATE 8000
/* Lets use 160 sample frames, just like GSM. */