Merge "res_musiconhold: Start playlist after initial announcement"
[asterisk/asterisk.git] / apps / app_ivrdemo.c
old mode 100755 (executable)
new mode 100644 (file)
index 198cfda..38134e2
 /*! \file
  *
  * \brief IVR Demo application
+ *
+ * \author Mark Spencer <markster@digium.com>
  * 
  * \ingroup applications
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+/*** MODULEINFO
+       <defaultenabled>no</defaultenabled>
+       <support_level>extended</support_level>
+ ***/
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 
-static char *tdesc = "IVR Demo Application";
+/*** DOCUMENTATION
+       <application name="IVRDemo" language="en_US">
+               <synopsis>
+                       IVR Demo Application.
+               </synopsis>
+               <syntax>
+                       <parameter name="filename" required="true" />
+               </syntax>
+               <description>
+                       <para>This is a skeleton application that shows you the basic structure to create your
+                       own asterisk applications and demonstrates the IVR demo.</para>
+               </description>
+       </application>
+ ***/
+
 static char *app = "IVRDemo";
-static char *synopsis = 
-"  This is a skeleton application that shows you the basic structure to create your\n"
-"own asterisk applications and demonstrates the IVR demo.\n";
 
 static int ivr_demo_func(struct ast_channel *chan, void *data)
 {
-       ast_verbose("IVR Demo, data is %s!\n", (char *)data);
+       ast_verbose("IVR Demo, data is %s!\n", (char *) data);
        return 0;
 }
 
@@ -82,63 +92,37 @@ AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0,
        { NULL },
 });
 
-STANDARD_LOCAL_USER;
-
-LOCAL_USER_DECL;
-
-static int skel_exec(struct ast_channel *chan, void *data)
+static int skel_exec(struct ast_channel *chan, const char *data)
 {
        int res=0;
-       struct localuser *u;
+       char *tmp;
        
        if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "skel requires an argument (filename)\n");
                return -1;
        }
        
-       LOCAL_USER_ADD(u);
+       tmp = ast_strdupa(data);
 
        /* Do our thing here */
 
-       if (chan->_state != AST_STATE_UP)
+       if (ast_channel_state(chan) != AST_STATE_UP)
                res = ast_answer(chan);
        if (!res)
-               res = ast_ivr_menu_run(chan, &ivr_demo, data);
-       
-       LOCAL_USER_REMOVE(u);
-
-       return res;
-}
-
-int unload_module(void)
-{
-       int res;
-       
-       res = ast_unregister_application(app);
-
-       STANDARD_HANGUP_LOCALUSERS;
+               res = ast_ivr_menu_run(chan, &ivr_demo, tmp);
        
        return res;
 }
 
-int load_module(void)
+static int unload_module(void)
 {
-       return ast_register_application(app, skel_exec, tdesc, synopsis);
+       return ast_unregister_application(app);
 }
 
-char *description(void)
+static int load_module(void)
 {
-       return tdesc;
+       return ast_register_application_xml(app, skel_exec);
 }
 
-int usecount(void)
-{
-       int res;
-       STANDARD_USECOUNT(res);
-       return res;
-}
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "IVR Demo Application");
 
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}