kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 158072 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r158072 | twilson | 2008-11-20 11:48:58 -0600 (Thu, 20 Nov 2008) | 2 lines

Begin on a crusade to end trailing whitespace!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-11-20 18:20:00 +00:00
parent 2d4e3b21ee
commit 3a9c27459e
5 changed files with 112 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
main/file.c
View File

@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/linkedlists.h"
#include "asterisk/module.h"
#include "asterisk/astobj2.h"
/*
* The following variable controls the layout of localized sound files.
@@ -280,12 +281,57 @@ static int exts_compare(const char *exts, const char *type)
return 0;
}
static void filestream_destructor(void *arg)
{
char *cmd = NULL;
size_t size = 0;
struct ast_filestream *f = arg;
/* Stop a running stream if there is one */
if (f->owner) {
if (f->fmt->format < AST_FORMAT_AUDIO_MASK) {
f->owner->stream = NULL;
AST_SCHED_DEL(f->owner->sched, f->owner->streamid);
#ifdef HAVE_DAHDI
ast_settimeout(f->owner, 0, NULL, NULL);
#endif
} else {
f->owner->vstream = NULL;
AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid);
}
}
/* destroy the translator on exit */
if (f->trans)
ast_translator_free_path(f->trans);
if (f->realfilename && f->filename) {
size = strlen(f->filename) + strlen(f->realfilename) + 15;
cmd = alloca(size);
memset(cmd,0,size);
snprintf(cmd,size,"/bin/mv -f %s %s",f->filename,f->realfilename);
ast_safe_system(cmd);
}
if (f->filename)
free(f->filename);
if (f->realfilename)
free(f->realfilename);
if (f->fmt->close)
f->fmt->close(f);
fclose(f->f);
if (f->vfs)
ast_closestream(f->vfs);
if (f->orig_chan_name)
free((void *) f->orig_chan_name);
ast_module_unref(f->fmt->module);
}
static struct ast_filestream *get_filestream(struct ast_format *fmt, FILE *bfile)
{
struct ast_filestream *s;
int l = sizeof(*s) + fmt->buf_size + fmt->desc_size; /* total allocation size */
if ( (s = ast_calloc(1, l)) == NULL)
if ( (s = ao2_alloc(l, filestream_destructor)) == NULL)
return NULL;
s->fmt = fmt;
s->f = bfile;
@@ -642,6 +688,10 @@ struct ast_frame *ast_readframe(struct ast_filestream *s)
int whennext = 0;
if (s && s->fmt)
f = s->fmt->read(s, &whennext);
if (f) {
ast_set_flag(f, AST_FRFLAG_FROM_FILESTREAM);
ao2_ref(s, +1);
}
return f;
}
@@ -791,49 +841,21 @@ int ast_stream_rewind(struct ast_filestream *fs, off_t ms)
int ast_closestream(struct ast_filestream *f)
{
char *cmd = NULL;
size_t size = 0;
/* Stop a running stream if there is one */
if (f->owner) {
if (f->fmt->format & AST_FORMAT_AUDIO_MASK) {
f->owner->stream = NULL;
AST_SCHED_DEL(f->owner->sched, f->owner->streamid);
ast_settimeout(f->owner, 0, NULL, NULL);
} else {
f->owner->vstream = NULL;
AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid);
}
if (ast_test_flag(&f->fr, AST_FRFLAG_FROM_FILESTREAM)) {
/* If this flag is still set, it essentially means that the reference
* count of f is non-zero. We can't destroy this filestream until
* whatever is using the filestream's frame has finished.
*
* Since this was called, however, we need to remove the reference from
* when this filestream was first allocated. That way, when the embedded
* frame is freed, the refcount will reach 0 and we can finish destroying
* this filestream properly.
*/
ao2_ref(f, -1);
return 0;
}
/* destroy the translator on exit */
if (f->trans)
ast_translator_free_path(f->trans);
if (f->realfilename && f->filename) {
size = strlen(f->filename) + strlen(f->realfilename) + 15;
cmd = alloca(size);
memset(cmd, 0, size);
snprintf(cmd, size, "/bin/mv -f %s %s", f->filename, f->realfilename);
ast_safe_system(cmd);
}
if (f->fmt->close) {
f->fmt->close(f);
}
if (f->filename)
ast_free(f->filename);
if (f->realfilename)
ast_free(f->realfilename);
fclose(f->f);
if (f->vfs)
ast_closestream(f->vfs);
if (f->orig_chan_name)
free((void *) f->orig_chan_name);
if (f->write_buffer) {
ast_free(f->write_buffer);
}
ast_module_unref(f->fmt->module);
ast_free(f);
ao2_ref(f, -1);
return 0;
}
@@ -1255,6 +1277,17 @@ int ast_waitstream_exten(struct ast_channel *c, const char *context)
-1, -1, context);
}
void ast_filestream_frame_freed(struct ast_frame *fr)
{
struct ast_filestream *fs;
ast_clear_flag(fr, AST_FRFLAG_FROM_FILESTREAM);
fs = (struct ast_filestream *) (((char *) fr) - offsetof(struct ast_filestream, fr));
ao2_ref(fs, -1);
}
/*
* if the file name is non-empty, try to play it.
* Return 0 if success, -1 if error, digit if interrupted by a digit.