mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-19 00:00:09 +00:00
Update for newer libpri
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3854,7 +3854,7 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
|
|||||||
if (p->pri->pri) {
|
if (p->pri->pri) {
|
||||||
if (!pri_grab(p, p->pri)) {
|
if (!pri_grab(p, p->pri)) {
|
||||||
#ifdef PRI_PROGRESS
|
#ifdef PRI_PROGRESS
|
||||||
pri_progress(p->pri->pri,p->call, 1);
|
pri_progress(p->pri->pri,p->call, p->prioffset, 1);
|
||||||
#else
|
#else
|
||||||
pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
|
pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
|
||||||
#endif
|
#endif
|
||||||
@@ -3968,7 +3968,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
|
|||||||
if (p->pri->pri) {
|
if (p->pri->pri) {
|
||||||
if (!pri_grab(p, p->pri)) {
|
if (!pri_grab(p, p->pri)) {
|
||||||
#ifdef PRI_PROGRESS
|
#ifdef PRI_PROGRESS
|
||||||
pri_progress(p->pri->pri,p->call, 1);
|
pri_progress(p->pri->pri,p->call, p->prioffset, 1);
|
||||||
#else
|
#else
|
||||||
pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
|
pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
|
||||||
#endif
|
#endif
|
||||||
@@ -6536,10 +6536,10 @@ static void *pri_dchannel(void *vpri)
|
|||||||
ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvt[chan]->channel);
|
ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvt[chan]->channel);
|
||||||
if (e->ring.complete || !pri->overlapdial) {
|
if (e->ring.complete || !pri->overlapdial) {
|
||||||
/* Just announce proceeding */
|
/* Just announce proceeding */
|
||||||
#ifdef PRI_PROCEEDING
|
#ifdef PRI_PROCEEDING_FULL
|
||||||
pri_proceeding(pri->pri, e->ring.call, 0);
|
pri_proceeding(pri->pri, e->ring.call, chan, 0);
|
||||||
#else
|
#else
|
||||||
#warning "You need newer libpri!"
|
#warning "You need a newer libpri!"
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
pri_need_more_info(pri->pri, e->ring.call, chan, 1);
|
pri_need_more_info(pri->pri, e->ring.call, chan, 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user