[Asterisk-cvs] asterisk/apps app_voicemail.c,1.148,1.149

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv6524/apps

Modified Files:
	app_voicemail.c 
Log Message:
Move routines from voicemail to app for general use (part of bug #752)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- app_voicemail.c	15 Sep 2004 19:54:46 -0000	1.148
+++ app_voicemail.c	17 Sep 2004 15:05:29 -0000	1.149
@@ -3,7 +3,7 @@
  *
  * Voicemail System (did you ever think it could be so easy?)
  * 
- * Copyright (C) 2003, Digium Inc.
+ * Copyright (C) 2003-2004, Digium Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -74,7 +74,6 @@
 #define INTRO "vm-intro"
 
[...1527 lines suppressed...]
+ 				cmd = ast_play_and_wait(chan, "vm-reachoper");
  				if (!cmd)
  					cmd = ast_waitfordigit(chan, 600);
  			}
 #if 0
 			if (!cmd)
- 				cmd = play_and_wait(chan, "vm-tocancelmsg");
+ 				cmd = ast_play_and_wait(chan, "vm-tocancelmsg");
 #endif
  			if (!cmd)
  				cmd = ast_waitfordigit(chan, 6000);
@@ -5123,7 +4680,7 @@
  		}
  	}
  	if (outsidecaller)  
- 		play_and_wait(chan, "vm-goodbye");
+ 		ast_play_and_wait(chan, "vm-goodbye");
  	if (cmd == 't')
  		cmd = 0;
  	return cmd;