Merge "res_musiconhold: Start playlist after initial announcement"
[asterisk/asterisk.git] / apps / app_ivrdemo.c
old mode 100755 (executable)
new mode 100644 (file)
index d182eec..38134e2
@@ -1,36 +1,64 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * IVR Demo application
- * 
- * Copyright (C) 2005, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief IVR Demo application
+ *
+ * \author Mark Spencer <markster@digium.com>
+ * 
+ * \ingroup applications
  */
 
-#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>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-static char *tdesc = "IVR Demo Application";
+/*** MODULEINFO
+       <defaultenabled>no</defaultenabled>
+       <support_level>extended</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/file.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
+
+/*** 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;
 }
 
@@ -64,52 +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;
-       if (!data) {
+       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);
+               res = ast_ivr_menu_run(chan, &ivr_demo, tmp);
+       
        return res;
 }
 
-int unload_module(void)
+static int unload_module(void)
 {
-       STANDARD_HANGUP_LOCALUSERS;
        return ast_unregister_application(app);
 }
 
-int load_module(void)
+static int load_module(void)
 {
-       return ast_register_application(app, skel_exec, tdesc, synopsis);
+       return ast_register_application_xml(app, skel_exec);
 }
 
-char *description(void)
-{
-       return tdesc;
-}
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "IVR Demo Application");
 
-int usecount(void)
-{
-       int res;
-       STANDARD_USECOUNT(res);
-       return res;
-}
-
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}