kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

undoing 360785 due to merging mistake

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2012-03-29 19:59:30 +00:00
parent bf994f0e04
commit d501c2ea2d
9 changed files with 14 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_mixmonitor.c
View File

@@ -240,7 +240,6 @@ static const char * const mixmonitor_spy_type = "MixMonitor";
struct mixmonitor {
struct ast_audiohook audiohook;
struct ast_callid *callid;
char *filename;
char *filename_read;
char *filename_write;
@@ -396,10 +395,6 @@ static void mixmonitor_free(struct mixmonitor *mixmonitor)
ast_free(mixmonitor->name);
ast_free(mixmonitor->post_process);
}
if (mixmonitor->callid) {
ast_callid_unref(mixmonitor->callid);
}
ast_free(mixmonitor);
}
}
@@ -445,11 +440,6 @@ static void *mixmonitor_thread(void *obj)
int errflag = 0;
struct ast_format format_slin;
/* Keep callid association before any log messages */
if (mixmonitor->callid) {
ast_callid_threadassoc_add(mixmonitor->callid);
}
ast_verb(2, "Begin MixMonitor Recording %s\n", mixmonitor->name);
fs = &mixmonitor->mixmonitor_ds->fs;
@@ -684,9 +674,6 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
return;
}
/* reference be released at mixmonitor destruction */
mixmonitor->callid = ast_read_threadstorage_callid();
ast_pthread_create_detached_background(&thread, NULL, mixmonitor_thread, mixmonitor);
}