From d48612ee3d0ca491d542af81faca650b981dbd2a Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sat, 27 Sep 2003 00:30:07 +0000 Subject: [PATCH] Fix search path in app_mp3 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1556 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_mp3.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/apps/app_mp3.c b/apps/app_mp3.c index c8196a75ff..d050d5896f 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -28,6 +28,7 @@ #include #include +#define LOCAL_MPG_123 "/usr/local/bin/mpg123" #define MPG_123 "/usr/bin/mpg123" static char *tdesc = "Silly MP3 Application"; @@ -60,10 +61,22 @@ static int mp3play(char *filename, int fd) close(x); } /* Execute mpg123, but buffer if it's a net connection */ - if (strncmp(filename, "http://", 7)) - execl(MPG_123, MPG_123, "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL); - else - execl(MPG_123, MPG_123, "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL); + 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); + /* But many places has it in /usr/bin */ + execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024", "--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); + } + else { + /* Most commonly installed in /usr/local/bin */ + execl(MPG_123, "mpg123", "-q", "-s", "--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); + /* As a last-ditch effort, try to use PATH */ + execlp("mpg123", "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL); + } ast_log(LOG_WARNING, "Execute of mpg123 failed\n"); return -1; }