Rename newp to newpvt (bug #2190), change hold music.

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

diff --git a/Makefile b/Makefile
index bfd3b25a520ac2e365e1813322fdd8ae4d617e78..6efb48238b2c11bd3500f03196c4dc6b7fb5382b 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -444,6 +444,7 @@ samples: all datafiles adsi
        for x in sounds/*.mp3; do \
                install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
        done
+       rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
        :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
        for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \

diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 991ccae9ec23aecb1a2b75b41758897054855bed..78e702251032cf378f0c004bb64212fb95647998 100755 (executable)
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -2,7 +2,7 @@
 ; Music on hold class definitions
 ;
 [classes]
-;default => quietmp3:/var/lib/asterisk/mohmp3
+default => quietmp3:/var/lib/asterisk/mohmp3
 ;loud => mp3:/var/lib/asterisk/mohmp3
 ;random => quietmp3:/var/lib/asterisk/mohmp3,-z
 ;unbuffered => mp3nb:/var/lib/asterisk/mohmp3

diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index a1cfd913bfe7b1d11c124d71b974aafd21f13685..4ab0d915eba56b8202b0a14f3b97abf187679bbd 100755 (executable)
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -34,7 +34,7 @@ struct ast_translator {
        /*! Destination format */
        int dstfmt;
        /*! Private data associated with the translator */
-       struct ast_translator_pvt *(*new)(void);
+       struct ast_translator_pvt *(*newpvt)(void);
        /*! Input frame callback */
        int (*framein)(struct ast_translator_pvt *pvt, struct ast_frame *in);
        /*! Output frame callback */

diff --git a/sounds/fpm-calm-river.mp3 b/sounds/fpm-calm-river.mp3
new file mode 100755 (executable)
index 0000000..4fd6d76
Binary files /dev/null and b/sounds/fpm-calm-river.mp3 differ

diff --git a/sounds/sample-hold.mp3 b/sounds/sample-hold.mp3
deleted file mode 100755 (executable)
index 012bdc6..0000000
Binary files a/sounds/sample-hold.mp3 and /dev/null differ

diff --git a/translate.c b/translate.c
index 1bf22b5d06f13628104cbec2450d4734542ae61f..2bbda14da1387b7b09448d5985f2e1476ec91af4 100755 (executable)
--- a/translate.c
+++ b/translate.c
@@ -107,7 +107,7 @@ struct ast_trans_pvt *ast_translator_build_path(int dest, int source)
                                tmp->nextout.tv_sec = 0;
                                tmp->nextout.tv_usec = 0;
                                tmp->step = tr_matrix[source][dest].step;
-                               tmp->state = tmp->step->new();
+                               tmp->state = tmp->step->newpvt();
                                if (!tmp->state) {
                                        ast_log(LOG_WARNING, "Failed to build translator step from %d to %d\n", source, dest);
                                        free(tmp);
@@ -237,7 +237,7 @@ static void calc_cost(struct ast_translator *t,int samples)
                t->cost = 99999;
                return;
        }
-       pvt = t->new();
+       pvt = t->newpvt();
        if (!pvt) {
                ast_log(LOG_WARNING, "Translator '%s' appears to be broken and will probably fail.\n", t->name);
                t->cost = 99999;