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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Thu May 15 19:08:54 2008
New Revision: 116729

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116729
Log:
bring up to date with 1.6 stuff

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=116729&r1=116728&r2=116729
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Thu May 15 19:08:54 2008
@@ -21,7 +21,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.115 5/12/08 2055 EDT
+ *  version 0.116 5/15/08 2055 EDT
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -374,7 +374,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.115  5/12/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.116  5/15/2008";
 
 static char *app = "Rpt";
 
@@ -5802,7 +5802,9 @@
 		if (l->chan->cdr)
 			ast_set_flag(l->chan->cdr,AST_CDR_FLAG_POST_DISABLED);
 #endif
+#ifndef	NEW_ASTERISK
 		l->chan->whentohangup = 0;
+#endif
 		l->chan->appl = "Apprpt";
 		l->chan->data = "(Remote Rx)";
 		if (debug > 3)
@@ -10366,7 +10368,9 @@
 	if (l->chan){
 		ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
 		ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
+#ifndef	NEW_ASTERISK
 		l->chan->whentohangup = 0;
+#endif
 		l->chan->appl = "Apprpt";
 		l->chan->data = "(Remote Rx)";
 		if (option_verbose > 2)
@@ -10797,7 +10801,9 @@
 		if (myrpt->rxchannel->cdr)
 			ast_set_flag(myrpt->rxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
 #endif
+#ifndef	NEW_ASTERISK
 		myrpt->rxchannel->whentohangup = 0;
+#endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Repeater Rx)";
 		if (option_verbose > 2)
@@ -10853,7 +10859,9 @@
 			if (myrpt->txchannel->cdr)
 				ast_set_flag(myrpt->txchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
 #endif
+#ifndef	NEW_ASTERISK
 			myrpt->txchannel->whentohangup = 0;
+#endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Repeater Tx)";
 			if (option_verbose > 2)
@@ -13763,7 +13771,9 @@
 		if (myrpt->rxchannel->cdr)
 			ast_set_flag(myrpt->rxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
 #endif
+#ifndef	NEW_ASTERISK
 		myrpt->rxchannel->whentohangup = 0;
+#endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Link Rx)";
 		if (option_verbose > 2)
@@ -13803,7 +13813,9 @@
 			if (myrpt->txchannel->cdr)
 				ast_set_flag(myrpt->txchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
 #endif
+#ifndef	NEW_ASTERISK
 			myrpt->txchannel->whentohangup = 0;
+#endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Link Tx)";
 			if (option_verbose > 2)