dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Revert some silly code that snuck into trunk from my working copy. Sorry! 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@210522 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2009-08-05 14:09:24 +00:00
parent c32b8a190f
commit b2e008a372
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main/file.c
View File

@ -320,7 +320,6 @@ static void filestream_destructor(void *arg)
free(f->filename);
if (f->realfilename)
free(f->realfilename);
ast_free(f->open_filename);
if (f->fmt->close) {
void (*closefn)(struct ast_filestream *) = f->fmt->close;
closefn(f);
@ -473,7 +472,6 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm
s->fmt = f;
s->trans = NULL;
s->filename = NULL;
s->open_filename = ast_strdup(fn);;
if (s->fmt->format & AST_FORMAT_AUDIO_MASK) {
if (chan->stream)
ast_closestream(chan->stream);
@ -828,30 +826,7 @@ static int ast_fsread_video(const void *data)
int ast_applystream(struct ast_channel *chan, struct ast_filestream *s)
{
struct ast_party_connected_line connected;
char *fn;
ast_channel_lock(chan);
ast_party_connected_line_set_init(&connected, &chan->connected);
if (ast_strlen_zero(chan->connected.id.number)) {
connected.id.number = ast_strdupa(chan->exten);
}
ast_channel_unlock(chan);
fn = ast_strdupa(s->open_filename);
if ((fn = strrchr(fn, '/'))) {
char *dot;
*fn++ = '\0';
if ((dot = strrchr(fn, '.'))) {
*dot = '\0';
}
}
connected.id.number = connected.id.name = fn;
ast_channel_update_connected_line(chan, &connected);
s->owner = chan;
return 0;
}