Fixed bug in remote base part of app_rpt, and updated rpt.conf.sample to

reflect new changes in operation.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3285 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index bf6a51d41f66532a2f628e2f34dd670eb1df461e..526af3e8d836a437019b0de4a128d9fa401f657c 100755 (executable)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -3,7 +3,7 @@
  * Asterisk -- A telephony toolkit for Linux.
  *
  * Radio Repeater / Remote Base program 
- *  version 0.4 6/19/04
+ *  version 0.5 6/22/04
  * 
  * Copyright (C) 2002-2004, Jim Dixon, WB6NIL
  *
@@ -1977,8 +1977,8 @@ static int rpt_exec(struct ast_channel *chan, void *data)
        myrpt->remotetx = 0;
        myrpt->remoteon = 1;
        ast_mutex_unlock(&myrpt->lock);
-       ast_set_write_format(chan, ast_best_codec(chan->nativeformats));
-       ast_set_read_format(chan, ast_best_codec(chan->nativeformats));
+       ast_set_write_format(chan, AST_FORMAT_SLINEAR);
+       ast_set_read_format(chan, AST_FORMAT_SLINEAR);
        /* if we are on 2w loop and are a remote, turn EC on */
        if (myrpt->remote && (myrpt->rxchannel == myrpt->txchannel))
        {

diff --git a/configs/rpt.conf.sample b/configs/rpt.conf.sample
index 546a61deeee21ff7725968138e4a9d9657dfead2..3cc787e8084242115f95156df5aa876203fa7556 100755 (executable)
--- a/configs/rpt.conf.sample
+++ b/configs/rpt.conf.sample
@@ -1,17 +1,13 @@
 ; Radio Repeater / Remote Base configuration file (for use with app_rpt)
 ;
 
-;[oakhurst]                            ; Name of First Repeater
+;[000]                                 ; Node ID of first repeater
 
 ;rxchannel = Zap/1                     ; Rx audio/signalling channel
 ; Note: if you use a unified interface (tx/rx on one channel), only
 ; specify the rxchannel and the txchannel will be assumed from the rxchannel
 ;txchannel = Zap/2                     ; Tx audio/signalling channel
-;remote_rxchannel = Zap/3              ; Remote Base Rx audio/signalling channel
-; Note: if you use a unified interface (tx/rx on one channel), only
-; specify the remote_rxchannel and the remote_txchannel will be assumed from the rxchannel
-;remote_txchannel = Zap/4              ; Remote Base Tx audio/signalling channel
-;tonezone = us                         ; use US tones
+;tonezone = us                         ; use US tones (default)
 ;simple = no                           ; Not in "simple" mode
 ;context = default                     ; dialing context for phone
 ;callerid = "WB6NIL Repeater" <(559) 692-1234>  ; Callerid for phone calls
@@ -24,3 +20,27 @@
 ; The default values for hangtime, time-out time, and id interval time are
 ; 5 seconds (5000 ms),  3 minutes (180000 ms), and 5 minutes (300000 ms)
 ; respectively
+
+;[001]                                 ; Node ID of second repeater
+
+;rxchannel = Zap/3                     ; Rx audio/signalling channel
+; Note: if you use a unified interface (tx/rx on one channel), only
+; specify the rxchannel and the txchannel will be assumed from the rxchannel
+;txchannel = Zap/4                     ; Tx audio/signalling channel
+;tonezone = us                         ; use US tones (default)
+;simple = no                           ; Not in "simple" mode
+;context = default                     ; dialing context for phone
+;callerid = "WB6NIL Repeater" <(559) 692-1234>  ; Callerid for phone calls
+;idrecording = wb6nil                  ; id recording
+;accountcode=RADIO                     ; account code (optional)
+;hangtime=1000                         ; squelch tail hang time (in ms) (optional)
+;totime=100000                         ; transmit time-out time (in ms) (optional)
+;idtime=30000                          ; id interval time (in ms) (optional)
+
+;[002]                                 ; Node ID of remote base
+
+;rxchannel = Zap/5                     ; Rx audio/signalling channel
+; Note: if you use a unified interface (tx/rx on one channel), only
+; specify the rxchannel and the txchannel will be assumed from the rxchannel
+;txchannel = Zap/6                     ; Tx audio/signalling channel
+;remote = yes