[zaptel-commits] kpfleming: branch 1.4 r3390 - in /branches/1.4: ./ wctc4xxp/base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Mon Dec 10 11:26:04 2007
New Revision: 3390

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3390
Log:
Merged revisions 3389 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3389 | kpfleming | 2007-12-10 11:24:59 -0600 (Mon, 10 Dec 2007) | 2 lines

remove explicit references to 5.3kb/s mode in wctc4xxp driver, as the driver can now accept both 5.3kb/s and 6.3kb/s (but will still only generate 6.3kb/s)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wctc4xxp/base.c

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

Modified: branches/1.4/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/base.c?view=diff&rev=3390&r1=3389&r2=3390
==============================================================================
--- branches/1.4/wctc4xxp/base.c (original)
+++ branches/1.4/wctc4xxp/base.c Mon Dec 10 11:26:04 2007
@@ -1771,27 +1771,20 @@
 
 			/* Setup Encoders and Decoders */
 
-			if (!mode || strlen(mode) < 4)
-			{
-				sprintf(wc->complexname, "g.729a / g.723.1 5.3kbps");
+			if (!mode || strlen(mode) < 4) {
+				sprintf(wc->complexname, "G.729a / G.723.1");
  				complexfmts = ZT_FORMAT_G729A | ZT_FORMAT_G723_1;
 				wc->numchannels = min_numchannels;
-			}
-			else if (mode[3] == '9')	/* "g729" */
-			{
-				sprintf(wc->complexname, "g.729a");
+			} else if (mode[3] == '9') {	/* "G.729" */
+				sprintf(wc->complexname, "G.729a");
 				complexfmts = ZT_FORMAT_G729A;
 				wc->numchannels = g729_numchannels;
-			}
-			else if (mode[3] == '3')	/* "g723" */
-			{
-				sprintf(wc->complexname, "g.723.1 5.3kbps");
+			} else if (mode[3] == '3') {	/* "G.723.1" */
+				sprintf(wc->complexname, "G.723.1");
 				complexfmts = ZT_FORMAT_G723_1;
 				wc->numchannels = g723_numchannels;
-			}
-			else
-			{
-				sprintf(wc->complexname, "g.729a / g.723.1 5.3kbps");
+			} else {
+				sprintf(wc->complexname, "G.729a / G.723.1");
 				complexfmts = ZT_FORMAT_G729A | ZT_FORMAT_G723_1;
 				wc->numchannels = min_numchannels;
 			}