[svn-commits] jdixon: branch jdixon/chan_usbradio-1.4 r133437 - /team/jdixon/chan_usbradio-...

[SVN commits to the Digium repositories]

Author: jdixon
Date: Thu Jul 24 08:04:35 2008
New Revision: 133437

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133437
Log:
Added support for new verson of chan_rtpdir

Modified:
    team/jdixon/chan_usbradio-1.4/apps/app_rpt.c

Modified: team/jdixon/chan_usbradio-1.4/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_rpt.c?view=diff&rev=133437&r1=133436&r2=133437
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Thu Jul 24 08:04:35 2008
@@ -21,7 +21,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.119 6/03/08 2055 EDT
+ *  version 0.120 7/24/08 2055 EDT
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -1401,7 +1401,7 @@
 	 
 		l = l->next;
 	}
-	ast_log(LOG_NOTICE, "numoflinks=%i\n",numoflinks);
+//	ast_log(LOG_NOTICE, "numoflinks=%i\n",numoflinks);
 	return numoflinks;
 }
 /*
@@ -1625,17 +1625,24 @@
 			myrpt->dtmf_local_str[i - 1] = 0;
 			myrpt->dtmf_local_timer = DTMF_LOCAL_TIME;
 			rpt_mutex_unlock(&myrpt->lock);
-			if (digit >= '0' && digit <='9')
-				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'0'], 0);
-			else if (digit >= 'A' && digit <= 'D')
-				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'A'+10], 0);
-			else if (digit == '*')
-				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[14], 0);
-			else if (digit == '#')
-				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[15], 0);
-			else {
-				/* not handled */
-				ast_log(LOG_DEBUG, "Unable to generate DTMF tone '%c' for '%s'\n", digit, myrpt->txchannel->name);
+			if (!strncasecmp(myrpt->txchannel->name,"rtpdir",6))
+			{
+				ast_senddigit(myrpt->txchannel,digit);
+			} 
+			else
+			{
+				if (digit >= '0' && digit <='9')
+					ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'0'], 0);
+				else if (digit >= 'A' && digit <= 'D')
+					ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'A'+10], 0);
+				else if (digit == '*')
+					ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[14], 0);
+				else if (digit == '#')
+					ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[15], 0);
+				else {
+					/* not handled */
+					ast_log(LOG_DEBUG, "Unable to generate DTMF tone '%c' for '%s'\n", digit, myrpt->txchannel->name);
+				}
 			}
 			rpt_mutex_lock(&myrpt->lock);
 		}
@@ -13244,7 +13251,7 @@
 		return -1;
 	}
 
-	ast_log(LOG_NOTICE,"parsing argument=%s \n",tmp);
+//	ast_log(LOG_NOTICE,"parsing argument=%s \n",tmp);
 
 	altp=strstr(tmp, "|*");
 	if(altp){
@@ -13262,9 +13269,9 @@
 	strsep(&stringp, "|");
 	options = stringp;
 
-	ast_log(LOG_NOTICE,"options=%s \n",options);
-	if(memp>0)ast_log(LOG_NOTICE,"memp=%s \n",memp);
-	if(altp>0)ast_log(LOG_NOTICE,"altp=%s \n",altp);
+//	ast_log(LOG_NOTICE,"options=%s \n",options);
+//	if(memp>0)ast_log(LOG_NOTICE,"memp=%s \n",memp);
+//	if(altp>0)ast_log(LOG_NOTICE,"altp=%s \n",altp);
 
 	myrpt = NULL;
 	/* see if we can find our specified one */