[asterisk-commits] jdixon: branch jdixon/chan_usbradio-1.4 r156812 - /team/jdixon/chan_usbradio-...

[SVN commits to the Asterisk project]

Author: jdixon
Date: Fri Nov 14 03:21:34 2008
New Revision: 156812

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156812
Log:
Fixed link audio problem with real zaptel channel and
rx prio problem with linktolink

Modified:
    team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c

Modified: team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c?view=diff&rev=156812&r1=156811&r2=156812
==============================================================================
--- team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c Fri Nov 14 03:21:34 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.167 11/12/08 
+ *  version 0.168 11/14/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -408,7 +408,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.167  11/12/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.168  11/14/2008";
 
 static char *app = "Rpt";
 
@@ -12598,7 +12598,7 @@
 				myrpt->p.hangtime;
 		}
 		/* if in 1/2 or 3/4 duplex, give rx priority */
-		if ((myrpt->p.duplex < 2) && (myrpt->keyed)) totx = 0;
+		if ((myrpt->p.duplex < 2) && (myrpt->keyed) && (!myrpt->p.linktolink)) totx = 0;
 		/* Disable the local transmitter if we are timed out */
 		totx = totx && myrpt->totimer;
 		/* if timed-out and not said already, say it */
@@ -12698,7 +12698,7 @@
 		myrpt->txrealkeyed = totx;
 		totx = totx || (!AST_LIST_EMPTY(&myrpt->txq));
 		/* if in 1/2 or 3/4 duplex, give rx priority */
-		if ((myrpt->p.duplex < 2) && (myrpt->keyed)) totx = 0;
+		if ((myrpt->p.duplex < 2) && (!myrpt->p.linktolink) && (myrpt->keyed)) totx = 0;
 		if (totx && (!lasttx))
 		{
 			char mydate[100],myfname[100];
@@ -13598,17 +13598,6 @@
 			{
 				struct ast_frame *f1;
 
-
-				l = myrpt->links.next;
-				/* go thru all the links */
-				while(l != &myrpt->links)
-				{
-					/* foop */
-					if (l->chan && altlink(myrpt,l) && (!l->lastrx) && ((l->newkey < 2) || l->lasttx ||
-					    strncasecmp(l->chan->name,"IAX",3)))
-						ast_write(l->chan,f);
-					l = l->next;
-				}
 				if (myrpt->p.duplex < 2)
 				{
 					if (myrpt->txrealkeyed) 
@@ -14134,6 +14123,17 @@
 			{
 				if (myrpt->monstream) 
 					ast_writestream(myrpt->monstream,f);
+
+				l = myrpt->links.next;
+				/* go thru all the links */
+				while(l != &myrpt->links)
+				{
+					/* foop */
+					if (l->chan && altlink(myrpt,l) && (!l->lastrx) && ((l->newkey < 2) || l->lasttx ||
+					    strncasecmp(l->chan->name,"IAX",3)))
+						ast_write(l->chan,f);
+					l = l->next;
+				}
 			}
 			if (f->frametype == AST_FRAME_CONTROL)
 			{