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

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3560 f38db490-d61c-443f-a65b-d21fe96a405b

6 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index bfd3b25a5..6efb48238 100755
--- 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 991ccae9e..78e702251 100755
--- 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 a1cfd913b..4ab0d915e 100755
--- 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
index 000000000..4fd6d761e
--- /dev/null
+++ b/sounds/fpm-calm-river.mp3
diff --git a/sounds/sample-hold.mp3 b/sounds/sample-hold.mp3
deleted file mode 100755
index 012bdc610..000000000
--- a/sounds/sample-hold.mp3
+++ /dev/null
diff --git a/translate.c b/translate.c
index 1bf22b5d0..2bbda14da 100755
--- 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;