mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
reverting blocks 9 and 10 from revision 7547
fixes bug 6080 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -426,8 +426,6 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int
|
||||
unsigned char *data;
|
||||
int len;
|
||||
int res = -1;
|
||||
short *data2;
|
||||
int x;
|
||||
|
||||
if (!chan->_softhangup)
|
||||
res = ast_autoservice_start(chan);
|
||||
@@ -448,10 +446,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int
|
||||
len = 0;
|
||||
}
|
||||
if (data) {
|
||||
data2 = alloca(len * 2);
|
||||
for (x=0;x<len;x++)
|
||||
data2[x] = AST_MULAW(data[x]);
|
||||
careful_write(conf->fd, (unsigned char *)data2, len << 1, 1);
|
||||
careful_write(conf->fd, data, len, 1);
|
||||
}
|
||||
|
||||
AST_LIST_UNLOCK(&confs);
|
||||
|
Reference in New Issue
Block a user