reverting blocks 9 and 10 from revision 7547
authorMatt O'Gorman <mogorman@digium.com>
Mon, 30 Jan 2006 21:16:43 +0000 (21:16 +0000)
committerMatt O'Gorman <mogorman@digium.com>
Mon, 30 Jan 2006 21:16:43 +0000 (21:16 +0000)
fixes bug 6080

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8938 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 73c52ac..205b5ac 100644 (file)
@@ -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);