[svn-commits] kpfleming: branch kpfleming/nostubs r70950 - in /team/kpfleming/nostubs: apps...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jun 21 17:40:05 2007
New Revision: 70950

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70950
Log:
and now the user can disable building of res_monitor but still use app_queue

Modified:
    team/kpfleming/nostubs/apps/app_queue.c
    team/kpfleming/nostubs/channels/chan_agent.c
    team/kpfleming/nostubs/include/asterisk/adsi.h
    team/kpfleming/nostubs/include/asterisk/monitor.h

Modified: team/kpfleming/nostubs/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/nostubs/apps/app_queue.c?view=diff&rev=70950&r1=70949&r2=70950
==============================================================================
--- team/kpfleming/nostubs/apps/app_queue.c (original)
+++ team/kpfleming/nostubs/apps/app_queue.c Thu Jun 21 17:40:05 2007
@@ -55,6 +55,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<use>res_monitor</use>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/kpfleming/nostubs/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/nostubs/channels/chan_agent.c?view=diff&rev=70950&r1=70949&r2=70950
==============================================================================
--- team/kpfleming/nostubs/channels/chan_agent.c (original)
+++ team/kpfleming/nostubs/channels/chan_agent.c Thu Jun 21 17:40:05 2007
@@ -30,6 +30,10 @@
  *
  * \ingroup channel_drivers
  */
+
+/*** MODULEINFO
+	<use>res_monitor</use>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/kpfleming/nostubs/include/asterisk/adsi.h
URL: http://svn.digium.com/view/asterisk/team/kpfleming/nostubs/include/asterisk/adsi.h?view=diff&rev=70950&r1=70949&r2=70950
==============================================================================
--- team/kpfleming/nostubs/include/asterisk/adsi.h (original)
+++ team/kpfleming/nostubs/include/asterisk/adsi.h Thu Jun 21 17:40:05 2007
@@ -352,5 +352,7 @@
  */
 adsi_api(ast_adsi_input_format, unsigned char *buf, int num, int dir, int wrap, char *format1, char *format2);
 
+#undef adsi_api
+
 #endif /* _ASTERISK_ADSI_H */
 

Modified: team/kpfleming/nostubs/include/asterisk/monitor.h
URL: http://svn.digium.com/view/asterisk/team/kpfleming/nostubs/include/asterisk/monitor.h?view=diff&rev=70950&r1=70949&r2=70950
==============================================================================
--- team/kpfleming/nostubs/include/asterisk/monitor.h (original)
+++ team/kpfleming/nostubs/include/asterisk/monitor.h Thu Jun 21 17:40:05 2007
@@ -44,23 +44,33 @@
 	int (*stop)(struct ast_channel *chan, int need_lock);
 };
 
+#if defined(AST_MODULE_RES_MONITOR)
+#define monitor_api(name, ...) int name(__VA_ARGS__)
+#else
+#define monitor_api(name, ...) static inline int name(__VA_ARGS__) { return -1; }
+#endif
+
 /* Start monitoring a channel */
-int ast_monitor_start(struct ast_channel *chan, const char *format_spec,
-		      const char *fname_base, int need_lock );
+monitor_api(ast_monitor_start, struct ast_channel *chan, const char *format_spec, const char *fname_base, int need_lock);
 
 /* Stop monitoring a channel */
-int ast_monitor_stop(struct ast_channel *chan, int need_lock);
+monitor_api(ast_monitor_stop, struct ast_channel *chan, int need_lock);
 
 /* Change monitoring filename of a channel */
-int ast_monitor_change_fname(struct ast_channel *chan,
-			     const char *fname_base, int need_lock);
+monitor_api(ast_monitor_change_fname, struct ast_channel *chan, const char *fname_base, int need_lock);
 
+#if defined(AST_MODULE_RES_MONITOR)
 void ast_monitor_setjoinfiles(struct ast_channel *chan, int turnon);
+#else
+static inline void ast_monitor_setjoinfiles(struct ast_channel *chan, int turnon) { }
+#endif
 
 /* Pause monitoring of a channel */
-int ast_monitor_pause(struct ast_channel *chan);
+monitor_api(ast_monitor_pause, struct ast_channel *chan);
 
 /* Unpause monitoring of a channel */
-int ast_monitor_unpause(struct ast_channel *chan);
+monitor_api(ast_monitor_unpause, struct ast_channel *chan);
+
+#undef monitor_api
 
 #endif /* _ASTERISK_MONITOR_H */