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
This commit is contained in:
parent
8a6b833f01
commit
1b705fdbac
1
Makefile
1
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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -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;
|
||||
|
|
Reference in New Issue