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/chan_alsa.c | |
| 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/chan_alsa.c')
| -rwxr-xr-x | channels/chan_alsa.c | 10 |
1 files changed, 5 insertions, 5 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; |