kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-08-01 14:19:04 +00:00
parent fbe6024753
commit 05e338ce75
6 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

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

2
configs/musiconhold.conf.sample
View File

@@ -2,7 +2,7 @@
; Music on hold class definitions ; Music on hold class definitions
; ;
[classes] [classes]
;default => quietmp3:/var/lib/asterisk/mohmp3 default => quietmp3:/var/lib/asterisk/mohmp3
;loud => mp3:/var/lib/asterisk/mohmp3 ;loud => mp3:/var/lib/asterisk/mohmp3
;random => quietmp3:/var/lib/asterisk/mohmp3,-z ;random => quietmp3:/var/lib/asterisk/mohmp3,-z
;unbuffered => mp3nb:/var/lib/asterisk/mohmp3 ;unbuffered => mp3nb:/var/lib/asterisk/mohmp3

2
include/asterisk/translate.h
View File

@@ -34,7 +34,7 @@ struct ast_translator {
/*! Destination format */ /*! Destination format */
int dstfmt; int dstfmt;
/*! Private data associated with the translator */ /*! Private data associated with the translator */
struct ast_translator_pvt *(*new)(void); struct ast_translator_pvt *(*newpvt)(void);
/*! Input frame callback */ /*! Input frame callback */
int (*framein)(struct ast_translator_pvt *pvt, struct ast_frame *in); int (*framein)(struct ast_translator_pvt *pvt, struct ast_frame *in);
/*! Output frame callback */ /*! Output frame callback */

BIN
sounds/fpm-calm-river.mp3 Executable file
View File

Binary file not shown.

BIN
sounds/sample-hold.mp3
View File

Binary file not shown.

4
translate.c
View File

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