[asterisk-commits] russell: trunk r56889 - in /trunk: ./ channels/chan_alsa.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Feb 26 14:43:18 2007
New Revision: 56889

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56889
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_alsa.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?view=diff&rev=56889&r1=56888&r2=56889
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Mon Feb 26 14:43:18 2007
@@ -83,8 +83,8 @@
 
 #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.  */