moh files will now be distributed in native format, not mp3, so...

update sounds/Makefile to download/unpack the proper files
remove all evidence of mpg123 from the main Makefile
change the sample musiconhold.conf file to use native mode instead of mp3

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

diff --git a/Makefile b/Makefile
index 3731761..fc74bb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,6 @@ ifeq ($(OSARCH),Linux)
       endif
     endif
   endif
-  MPG123TARG=linux
 endif
 
 GREP=grep
@@ -239,12 +238,10 @@ ifeq ($(OSARCH),FreeBSD)
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
-  MPG123TARG=freebsd
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
   AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
-  MPG123TARG=netbsd
 endif
 
 ifeq ($(OSARCH),OpenBSD)
@@ -512,7 +509,6 @@ clean: clean-depend
        rm -f include/asterisk/version.h
        rm -f .tags-sources tags TAGS
        @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
-       @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
        $(MAKE) -C db1-ast clean
        $(MAKE) -C stdtime clean
 
@@ -615,7 +611,6 @@ bininstall: all
        else \
                echo "You need to do cvs update -d not just cvs update" ; \
        fi 
-       if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 
 install-subdirs:
        @for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
@@ -773,12 +768,6 @@ progdocs:
        (cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
        echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
 
-mpg123:
-       @wget -V >/dev/null || (echo "You need wget" ; false )
-       [ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
-       [ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
-       $(MAKE) -C mpg123-0.59r $(MPG123TARG)
-
 config:
        @if [ "${OSARCH}" = "Linux" ]; then \
                if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \

diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index edc88bb..bac580c 100644 (file)
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -2,10 +2,10 @@
 ; Music on Hold -- Sample Configuration
 ;
 
-[default]
-mode=quietmp3
-directory=/var/lib/asterisk/mohmp3
-
+;[samplemp3]
+;mode=quietmp3
+;directory=/var/lib/asterisk/mohmp3
+;
 ; valid mode options:
 ; quietmp3     -- default 
 ; mp3          -- loud
@@ -55,11 +55,11 @@ directory=/var/lib/asterisk/mohmp3
 ; understand when it loads.
 ;
 
-;[native]
-;mode=files
-;directory=/var/lib/asterisk/moh-native
+[default]
+mode=files
+directory=/var/lib/asterisk/moh
 ;
 ;[native-random]
 ;mode=files
-;directory=/var/lib/asterisk/moh-native
+;directory=/var/lib/asterisk/moh
 ;random=yes    ; Play the files in a random order

diff --git a/sounds/Makefile b/sounds/Makefile
index 6c28e34..44ea10b 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -15,7 +15,7 @@ include ../menuselect.makeopts
 
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
-MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/mohmp3
+MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
 CORE_SOUNDS_VERSION:=1.4.0
 SOUNDS_URL:=http://cork.digium.internal/apache2-default
 MENUSELECT_CORE_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
@@ -38,7 +38,11 @@ MENUSELECT_EXTRA_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_EXTRA_SOUNDS))
 MENUSELECT_EXTRA_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_EXTRA_SOUNDS))
 EXTRA_SOUNDS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=asterisk-extra-sounds-%.tar.gz)
 MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
-MENUSELECT_MOH:=$(subst -MP3,-mp3,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -WAV,-wav,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -ULAW,-ulaw,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -ALAW,-alaw,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -GSM,-gsm,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -G729,-g729,$(MENUSELECT_MOH))
 MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz)
 MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 

diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 59c74a3..860207d 100644 (file)
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -31,10 +31,18 @@
                <member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
                </member>
        </category>
-       <category name="MENUSELECT_MOH" displayname="Music On Hold File Package" positive_output="yes">
-               <member name="MOH-FREEPLAY-MP3" displayname="FreePlay Music On Hold Files, MP3 format" >
+       <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+               <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
                        <defaultenabled>yes</defaultenabled>
                </member>
+               <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+               </member>
+               <member name="MOH-FREEPLAY-ALAW" displayname="FreePlay Music On Hold Files, a-Law format" >
+               </member>
+               <member name="MOH-FREEPLAY-GSM" displayname="FreePlay Music On Hold Files, GSM format" >
+               </member>
+               <member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 format" >
+               </member>
        </category>
        <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
                <member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">