summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDoug Bailey <dbailey@digium.com>2008-06-16 21:42:46 +0000
committerDoug Bailey <dbailey@digium.com>2008-06-16 21:42:46 +0000
commit269037841164f92a3c6fd56ae22d9c9ec65210ab (patch)
treeb4b7eddc0519eba2dddaf417597a90020c2d3e2a /include
parentddfac77569c31007dd6ed771f96aeb29adf95157 (diff)
Clean up code that handles fsk mwi message generation by pulling it from do_monitor and creating its own thread.
Added RP-AS mwi message generation using patches from meneault as a basis. (closes issue #8587) Reported by: meneault Tested by: meneault git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/callerid.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index 8bf27158b..572351b34 100644
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -64,6 +64,13 @@
#define CID_START_POLARITY 2
#define CID_START_POLARITY_IN 3
+/* defines dealing with message waiting indication generation */
+/*! MWI SDMF format */
+#define CID_MWI_TYPE_SDMF 0x00
+/*! MWI MDMF format -- generate only MWI field */
+#define CID_MWI_TYPE_MDMF 0x01
+/*! MWI MDMF format -- generate name, callerid, date and MWI fields */
+#define CID_MWI_TYPE_MDMF_FULL 0x02
#define AST_LIN2X(a) ((codec == AST_FORMAT_ALAW) ? (AST_LIN2A(a)) : (AST_LIN2MU(a)))
#define AST_XLAW(a) ((codec == AST_FORMAT_ALAW) ? (AST_ALAW(a)) : (AST_MULAW(a)))
@@ -162,8 +169,14 @@ void callerid_free(struct callerid_state *cid);
*/
int ast_callerid_generate(unsigned char *buf, const char *name, const char *number, int codec);
-/*! \brief Generate message waiting indicator (stutter tone) */
-int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
+/*! \brief Generate message waiting indicator
+ * \param active The message indicator state
+ * -- either 0 no messages in mailbox or 1 messages in mailbox
+ * \param type Format of message (any of CID_MWI_TYPE_*)
+ * \see callerid_generate() for more info as it use the same encoding
+*/
+int vmwi_generate(unsigned char *buf, int active, int type, int codec, const char *name,
+ const char *number, int flags);
/*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)
* See ast_callerid_generate() for other details