[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.64, 1.65 file.h, 1.18, 1.19 musiconhold.h, 1.3, 1.4

[markster at lists.digium.com]

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

Modified Files:
	channel.h file.h musiconhold.h 
Log Message:
Merge anthm's native MOH patch (bug #2639) he promises me he'll rid it of ast_flag_moh...


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- channel.h	16 Dec 2004 03:15:20 -0000	1.64
+++ channel.h	24 Dec 2004 01:40:07 -0000	1.65
@@ -88,7 +88,8 @@
 
 	/*! Default music class */
 	char musicclass[MAX_LANGUAGE];
-
+	/*! Music State*/
+	void *music_state;
 	/*! Current generator data if there is any */
 	void *generatordata;
 	/*! Current active data generator */
@@ -230,6 +231,7 @@
 #define AST_FLAG_BLOCKING	(1 << 3)	/* if we are blocking */
 #define AST_FLAG_ZOMBIE		(1 << 4)	/* if we are a zombie */
 #define AST_FLAG_EXCEPTION	(1 << 5)	/* if there is a pending exception */
+#define AST_FLAG_MOH        (1 << 6)    /* XXX anthm promises me this will disappear XXX listening to moh */
 
 struct ast_bridge_config {
 	int play_to_caller;

Index: file.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/file.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- file.h	13 Nov 2004 16:13:07 -0000	1.18
+++ file.h	24 Dec 2004 01:40:07 -0000	1.19
@@ -203,6 +203,15 @@
  * \param chan channel to work with
  * \param filename to use
  * \param preflang prefered language to use
+ * \param asis if set, don't clear generators
+ * Returns a ast_filestream pointer if it opens the file, NULL on error
+ */
+struct ast_filestream *ast_openstream_full(struct ast_channel *chan, const char *filename, const char *preflang, int asis);
+//! Opens stream for use in seeking, playing
+/*!
+ * \param chan channel to work with
+ * \param filename to use
+ * \param preflang prefered language to use
  * Returns a ast_filestream pointer if it opens the file, NULL on error
  */
 struct ast_filestream *ast_openvstream(struct ast_channel *chan, const char *filename, const char *preflang);

Index: musiconhold.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/musiconhold.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- musiconhold.h	9 Dec 2004 19:55:01 -0000	1.3
+++ musiconhold.h	24 Dec 2004 01:40:07 -0000	1.4
@@ -25,8 +25,11 @@
 extern void ast_moh_stop(struct ast_channel *chan);
 
 extern void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, char *),
-								 void (*stop_ptr)(struct ast_channel *));
+										void (*stop_ptr)(struct ast_channel *),
+										void (*cleanup_ptr)(struct ast_channel *));
+	
 extern void ast_uninstall_music_functions(void);
+void ast_moh_cleanup(struct ast_channel *chan);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }