diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-03-29 19:59:30 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-03-29 19:59:30 +0000 |
| commit | d501c2ea2d56ece966b6615799dd7b66198176dd (patch) | |
| tree | 33ad80dfb8a5751b7d76e748621055083315251d /apps/app_mixmonitor.c | |
| parent | bf994f0e04696ba11ce0ec81df7880d61ef9c779 (diff) | |
undoing 360785 due to merging mistake
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_mixmonitor.c')
| -rw-r--r-- | apps/app_mixmonitor.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index c1f5ada72..a89b6cc5d 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -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); } |