diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-11-01 17:32:16 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-11-01 17:32:16 +0000 |
| commit | 10cbc4a1328af113d708d47596c79062357ff45b (patch) | |
| tree | d33e9f1335edb684946c74f2fa5dde7a0b72ba80 /channels/sig_analog.h | |
| parent | 53149a69dfeb09a86576ab705fa50ecb3feb0f40 (diff) | |
Merged revisions 293530 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r293530 | rmudgett | 2010-11-01 12:29:30 -0500 (Mon, 01 Nov 2010) | 10 lines
Analog 3-way call would not connect all parties if one was using sig_pri.
Also the "dahdi show channel" would not show the correct 3-way call
status.
* Synchronized the inthreeway flag between chan_dahdi and sig_analog.
* Fixed a my_set_linear_mode() sign error and made take an analog sub
channel enum.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index c1b611527..b58b0985a 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -213,7 +213,8 @@ struct analog_callback { int (* const distinctive_ring)(struct ast_channel *chan, void *pvt, int idx, int *ringdata); /* Sets the specified sub-channel in and out of signed linear mode, returns the value that was overwritten */ - int (* const set_linear_mode)(void *pvt, int idx, int linear_mode); + int (* const set_linear_mode)(void *pvt, enum analog_sub sub, int linear_mode); + void (* const set_inthreeway)(void *pvt, enum analog_sub sub, int inthreeway); void (* const get_and_handle_alarms)(void *pvt); void * (* const get_sigpvt_bridged_channel)(struct ast_channel *chan); int (* const get_sub_fd)(void *pvt, enum analog_sub sub); |