Merge BKW's mp3 improvements

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

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 98803a3..a2e0ce2 100755 (executable)
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -61,21 +61,21 @@ static int mp3play(char *filename, int fd)
                        close(x);
        }
        /* Execute mpg123, but buffer if it's a net connection */
-       if (strncmp(filename, "http://", 7)) {
+       if (!strncmp(filename, "http://", 7)) {
                /* Most commonly installed in /usr/local/bin */
-           execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+           execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
                /* But many places has it in /usr/bin */
-           execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+           execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
                /* As a last-ditch effort, try to use PATH */
-           execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+           execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
        }
        else {
                /* Most commonly installed in /usr/local/bin */
-           execl(MPG_123, "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+           execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
                /* But many places has it in /usr/bin */
-           execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+           execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
                /* As a last-ditch effort, try to use PATH */
-           execlp("mpg123", "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+           execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
        }
        ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
        return -1;