kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "local channel" variation so that we don't read/write to the same

Browse Source 
channel...  (bug #6058)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-12-26 00:47:28 +00:00
parent 96b3a24637
commit ec0b96837e
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/app_meetme.c
View File

@@ -139,6 +139,7 @@ static struct ast_conference {
ast_mutex_t listenlock; /* Conference specific lock (listeners) */ ast_mutex_t listenlock; /* Conference specific lock (listeners) */
char confno[AST_MAX_EXTENSION]; /* Conference */ char confno[AST_MAX_EXTENSION]; /* Conference */
struct ast_channel *chan; /* Announcements channel */ struct ast_channel *chan; /* Announcements channel */
struct ast_channel *lchan; /* Listen/Record channel */
int fd; /* Announcements fd */ int fd; /* Announcements fd */
int zapconf; /* Zaptel Conf # */ int zapconf; /* Zaptel Conf # */
int users; /* Number of active users */ int users; /* Number of active users */
@@ -509,7 +510,18 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
cnf = NULL; cnf = NULL;
goto cnfout; goto cnfout;
} }
cnf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
if (cnf->lchan) {
ast_set_read_format(cnf->lchan, AST_FORMAT_SLINEAR);
ast_set_write_format(cnf->lchan, AST_FORMAT_SLINEAR);
ztc.chan = 0;
ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
if (ioctl(cnf->lchan->fds[0], ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference\n");
ast_hangup(cnf->lchan);
cnf->lchan = NULL;
}
}
/* Fill the conference struct */ /* Fill the conference struct */
cnf->start = time(NULL); cnf->start = time(NULL);
cnf->zapconf = ztc.confno; cnf->zapconf = ztc.confno;
@@ -816,6 +828,8 @@ static int conf_free(struct ast_conference *conf)
} }
if (conf->origframe) if (conf->origframe)
ast_frfree(conf->origframe); ast_frfree(conf->origframe);
if (conf->lchan)
ast_hangup(conf->lchan);
if (conf->chan) if (conf->chan)
ast_hangup(conf->chan); ast_hangup(conf->chan);
else else
@@ -885,7 +899,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} }
} }
if ((conf->recording == MEETME_RECORD_OFF) && ((confflags & CONFFLAG_RECORDCONF) || (conf->chan))) { if ((conf->recording == MEETME_RECORD_OFF) && ((confflags & CONFFLAG_RECORDCONF) || (conf->lchan))) {
pthread_attr_init(&conf->attr); pthread_attr_init(&conf->attr);
pthread_attr_setdetachstate(&conf->attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&conf->attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&conf->recordthread, &conf->attr, recordthread, conf); ast_pthread_create(&conf->recordthread, &conf->attr, recordthread, conf);
@@ -2231,16 +2245,16 @@ static void *recordthread(void *args)
int x; int x;
const char *oldrecordingfilename = NULL; const char *oldrecordingfilename = NULL;
if (!cnf || !cnf->chan) { if (!cnf || !cnf->lchan) {
pthread_exit(0); pthread_exit(0);
} }
ast_stopstream(cnf->chan); ast_stopstream(cnf->lchan);
flags = O_CREAT|O_TRUNC|O_WRONLY; flags = O_CREAT|O_TRUNC|O_WRONLY;
cnf->recording = MEETME_RECORD_ACTIVE; cnf->recording = MEETME_RECORD_ACTIVE;
while (ast_waitfor(cnf->chan, -1) > -1) { while (ast_waitfor(cnf->lchan, -1) > -1) {
if (cnf->recording == MEETME_RECORD_TERMINATE) { if (cnf->recording == MEETME_RECORD_TERMINATE) {
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
@@ -2251,7 +2265,7 @@ static void *recordthread(void *args)
oldrecordingfilename = cnf->recordingfilename; oldrecordingfilename = cnf->recordingfilename;
} }
f = ast_read(cnf->chan); f = ast_read(cnf->lchan);
if (!f) { if (!f) {
res = -1; res = -1;
break; break;