diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-12 09:03:50 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-12 09:03:50 +0000 |
commit | 0ac7711a22bfc433c394d87fa58d2c553ba52b9f (patch) | |
tree | e2cb193cae19783f6b766de76726004c70d07d97 /channels | |
parent | 12fd7ca3bbc8df1293b20a615646e35b5033cb72 (diff) |
Version 0.2.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@484 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/chan_alsa.c | 10 | ||||
-rwxr-xr-x | channels/chan_modem.c | 18 | ||||
-rwxr-xr-x | channels/chan_modem_aopen.c | 2 | ||||
-rwxr-xr-x | channels/chan_modem_bestdata.c | 4 | ||||
-rwxr-xr-x | channels/chan_modem_i4l.c | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index be760b8bd..3e35a821f 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -506,7 +506,7 @@ static int alsa_answer(struct ast_channel *c) { ast_verbose( " << Console call has been answered >> \n"); answer_sound(); - c->state = AST_STATE_UP; + ast_setstate(c, AST_STATE_UP); cursound = -1; return 0; } @@ -684,7 +684,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan) needanswer = 0; f.frametype = AST_FRAME_CONTROL; f.subclass = AST_CONTROL_ANSWER; - chan->state = AST_STATE_UP; + ast_setstate(chan, AST_STATE_UP); return &f; } @@ -722,7 +722,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan) /* A real frame */ readpos = 0; left = FRAME_SIZE; - if (chan->state != AST_STATE_UP) { + if (chan->_state != AST_STATE_UP) { /* Don't transmit unless it's up */ return &f; } @@ -806,7 +806,7 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state) if (strlen(language)) strncpy(tmp->language, language, sizeof(tmp->language)-1); p->owner = tmp; - tmp->state = state; + ast_setstate(tmp, state); ast_pthread_mutex_lock(&usecnt_lock); usecnt++; ast_pthread_mutex_unlock(&usecnt_lock); @@ -1087,7 +1087,7 @@ int unload_module() close(sndcmd[1]); } if (alsa.owner) - ast_softhangup(alsa.owner); + ast_softhangup(alsa.owner, AST_SOFTHANGUP_APPUNLOAD); if (alsa.owner) return -1; return 0; diff --git a/channels/chan_modem.c b/channels/chan_modem.c index 09c58c22c..758235b4a 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -177,7 +177,7 @@ static int modem_call(struct ast_channel *ast, char *idest, int timeout) strcpy(dstr,where + p->stripmsd); /* if not a transfer or just sending tones, must be in correct state */ if (strcasecmp(rdest, "transfer") && strcasecmp(rdest,"sendtones")) { - if ((ast->state != AST_STATE_DOWN) && (ast->state != AST_STATE_RESERVED)) { + if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) { ast_log(LOG_WARNING, "modem_call called on %s, neither down nor reserved\n", ast->name); return -1; } @@ -191,15 +191,15 @@ static int modem_call(struct ast_channel *ast, char *idest, int timeout) if (p->mc->setdev(p, MODEM_DEV_HANDSET)) return -1; /* Should be immediately up */ - ast->state = AST_STATE_UP; + ast_setstate(ast, AST_STATE_UP); } else { if (p->mc->setdev) if (p->mc->setdev(p, MODEM_DEV_TELCO_SPK)) return -1; if (p->mc->dial) p->mc->dial(p, dstr); - ast->state = AST_STATE_DIALING; - while((ast->state != AST_STATE_UP) && (ms > 0)) { + ast_setstate(ast, AST_STATE_DIALING); + while((ast->_state != AST_STATE_UP) && (ms > 0)) { ms = ast_waitfor(ast, ms); /* Just read packets and watch what happens */ if (ms > 0) { @@ -410,7 +410,7 @@ static int modem_hangup(struct ast_channel *ast) /* Re-initialize */ if (p->mc->init) p->mc->init(p); - ast->state = AST_STATE_DOWN; + ast_setstate(ast, AST_STATE_DOWN); memset(p->cid, 0, sizeof(p->cid)); memset(p->dnid, 0, sizeof(p->dnid)); ((struct ast_modem_pvt *)(ast->pvt->pvt))->owner = NULL; @@ -423,7 +423,7 @@ static int modem_hangup(struct ast_channel *ast) if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Hungup '%s'\n", ast->name); ast->pvt->pvt = NULL; - ast->state = AST_STATE_DOWN; + ast_setstate(ast, AST_STATE_DOWN); restart_monitor(); return 0; } @@ -440,7 +440,7 @@ static int modem_answer(struct ast_channel *ast) } if (!res) { ast->rings = 0; - ast->state = AST_STATE_UP; + ast_setstate(ast, AST_STATE_UP); } return res; } @@ -494,7 +494,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state) tmp->type = type; tmp->fds[0] = i->fd; tmp->nativeformats = i->mc->formats; - tmp->state = state; + ast_setstate(tmp, state); if (state == AST_STATE_RING) tmp->rings = 1; tmp->pvt->pvt = i; @@ -858,7 +858,7 @@ int unload_module() p = iflist; while(p) { if (p->owner) - ast_softhangup(p->owner); + ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD); p = p->next; } iflist = NULL; diff --git a/channels/chan_modem_aopen.c b/channels/chan_modem_aopen.c index b832f8092..b33ce074c 100755 --- a/channels/chan_modem_aopen.c +++ b/channels/chan_modem_aopen.c @@ -202,7 +202,7 @@ static struct ast_frame *aopen_handle_escape(struct ast_modem_pvt *p, char esc) p->fr.frametype = AST_FRAME_CONTROL; p->fr.subclass = AST_CONTROL_RING; if (p->owner) - p->owner->state = AST_STATE_UP; + ast_setstate(p->owner, AST_STATE_UP); if (aopen_startrec(p)) return NULL; return &p->fr; diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c index b9f56d3b1..08a1c2e89 100755 --- a/channels/chan_modem_bestdata.c +++ b/channels/chan_modem_bestdata.c @@ -208,7 +208,7 @@ static struct ast_frame *bestdata_handle_escape(struct ast_modem_pvt *p, char es return &p->fr; case '@': /* response from "OK" in command mode */ if (p->owner) - p->owner->state = AST_STATE_UP; + ast_setstate(p->owner, AST_STATE_UP); if (bestdata_startrec(p)) return NULL; p->fr.frametype = AST_FRAME_CONTROL; p->fr.subclass = AST_CONTROL_RING; @@ -386,7 +386,7 @@ short *sp; unsigned long u; #define DLE 16 - if (p->owner && (p->owner->state == AST_STATE_UP) && + if (p->owner && (p->owner->_state == AST_STATE_UP) && (p->ministate != STATE_VOICEPLAY) && bestdata_startplay(p)) return -1; sp = (short *) f->data; /* stick DLE's in ahead of anything else */ diff --git a/channels/chan_modem_i4l.c b/channels/chan_modem_i4l.c index 609fefffb..553f144ee 100755 --- a/channels/chan_modem_i4l.c +++ b/channels/chan_modem_i4l.c @@ -208,7 +208,7 @@ static struct ast_frame *i4l_handle_escape(struct ast_modem_pvt *p, char esc) p->fr.frametype = AST_FRAME_CONTROL; p->fr.subclass = AST_CONTROL_ANSWER; if (p->owner) - p->owner->state = AST_STATE_UP; + ast_setstate(p->owner, AST_STATE_UP); if (i4l_startrec(p)) return NULL; return &p->fr; |