Merged revisions 281870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r281870 | rmudgett | 2010-08-11 15:30:29 -0500 (Wed, 11 Aug 2010) | 4 lines Fix a call to analog_set_pulsedial() not setting 0 or 1 only. * Also a couple minor tweaks. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
3960c2c8ea
commit
b8a71201dc
|
@ -2471,7 +2471,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
|
||||||
ast_debug(1, "Got event %s(%d) on channel %d (index %d)\n", analog_event2str(res), res, p->channel, index);
|
ast_debug(1, "Got event %s(%d) on channel %d (index %d)\n", analog_event2str(res), res, p->channel, index);
|
||||||
|
|
||||||
if (res & (ANALOG_EVENT_PULSEDIGIT | ANALOG_EVENT_DTMFUP)) {
|
if (res & (ANALOG_EVENT_PULSEDIGIT | ANALOG_EVENT_DTMFUP)) {
|
||||||
analog_set_pulsedial(p, (res & ANALOG_EVENT_PULSEDIGIT));
|
analog_set_pulsedial(p, (res & ANALOG_EVENT_PULSEDIGIT) ? 1 : 0);
|
||||||
ast_debug(1, "Detected %sdigit '%c'\n", (res & ANALOG_EVENT_PULSEDIGIT) ? "pulse ": "", res & 0xff);
|
ast_debug(1, "Detected %sdigit '%c'\n", (res & ANALOG_EVENT_PULSEDIGIT) ? "pulse ": "", res & 0xff);
|
||||||
analog_confmute(p, 0);
|
analog_confmute(p, 0);
|
||||||
p->subs[index].f.frametype = AST_FRAME_DTMF_END;
|
p->subs[index].f.frametype = AST_FRAME_DTMF_END;
|
||||||
|
@ -3581,11 +3581,9 @@ void *analog_handle_init_event(struct analog_pvt *i, int event)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ANALOG_EVENT_REMOVED: /* destroy channel, will actually do so in do_monitor */
|
case ANALOG_EVENT_REMOVED: /* destroy channel, will actually do so in do_monitor */
|
||||||
ast_log(LOG_NOTICE,
|
ast_log(LOG_NOTICE, "Got DAHDI_EVENT_REMOVED. Destroying channel %d\n",
|
||||||
"Got DAHDI_EVENT_REMOVED. Destroying channel %d\n",
|
i->channel);
|
||||||
i->channel);
|
return i->chan_pvt;
|
||||||
return i->chan_pvt;
|
|
||||||
break;
|
|
||||||
case ANALOG_EVENT_NEONMWI_ACTIVE:
|
case ANALOG_EVENT_NEONMWI_ACTIVE:
|
||||||
analog_handle_notify_message(NULL, i, -1, ANALOG_EVENT_NEONMWI_ACTIVE);
|
analog_handle_notify_message(NULL, i, -1, ANALOG_EVENT_NEONMWI_ACTIVE);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -271,6 +271,7 @@ struct analog_pvt {
|
||||||
unsigned int transfer:1;
|
unsigned int transfer:1;
|
||||||
unsigned int transfertobusy:1; /*!< allow flash-transfers to busy channels */
|
unsigned int transfertobusy:1; /*!< allow flash-transfers to busy channels */
|
||||||
unsigned int use_callerid:1; /*!< Whether or not to use caller id on this channel */
|
unsigned int use_callerid:1; /*!< Whether or not to use caller id on this channel */
|
||||||
|
unsigned int callwaitingcallerid:1;
|
||||||
const struct ast_channel_tech *chan_tech;
|
const struct ast_channel_tech *chan_tech;
|
||||||
/*!
|
/*!
|
||||||
* \brief TRUE if distinctive rings are to be detected.
|
* \brief TRUE if distinctive rings are to be detected.
|
||||||
|
@ -287,7 +288,6 @@ struct analog_pvt {
|
||||||
int polarityonanswerdelay;
|
int polarityonanswerdelay;
|
||||||
int stripmsd;
|
int stripmsd;
|
||||||
enum analog_cid_start cid_start;
|
enum analog_cid_start cid_start;
|
||||||
int callwaitingcallerid;
|
|
||||||
char mohsuggest[MAX_MUSICCLASS];
|
char mohsuggest[MAX_MUSICCLASS];
|
||||||
char cid_num[AST_MAX_EXTENSION];
|
char cid_num[AST_MAX_EXTENSION];
|
||||||
char cid_name[AST_MAX_EXTENSION];
|
char cid_name[AST_MAX_EXTENSION];
|
||||||
|
|
Loading…
Reference in New Issue