main/cdrs: Preserve context/extension when executing a Macro or GoSub
[asterisk/asterisk.git] / apps / app_echo.c
index 44e6f09..d8b2079 100644 (file)
  * \brief Echo application -- play back what you hear to evaluate latency
  *
  * \author Mark Spencer <markster@digium.com>
- * 
+ *
  * \ingroup applications
  */
 
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
 #include "asterisk/module.h"
+#include "asterisk/channel.h"
 
-static char *app = "Echo";
-
-static char *synopsis = "Echo audio, video, or DTMF back to the calling party";
-
-static char *descrip = 
-"  Echo(): This application will echo any audio, video, or DTMF frames read from\n"
-"the calling channel back to itself. If the DTMF digit '#' is received, the\n"
-"application will exit.\n";
+/*** DOCUMENTATION
+       <application name="Echo" language="en_US">
+               <synopsis>
+                       Echo media, DTMF back to the calling party
+               </synopsis>
+               <syntax />
+               <description>
+                       <para>Echos back any media or DTMF frames read from the calling 
+                       channel back to itself. This will not echo CONTROL, MODEM, or NULL
+                       frames. Note: If '#' detected application exits.</para>
+                       <para>This application does not automatically answer and should be
+                       preceeded by an application such as Answer() or Progress().</para>
+               </description>
+       </application>
+ ***/
 
+static const char app[] = "Echo";
 
-static int echo_exec(struct ast_channel *chan, void *data)
+static int echo_exec(struct ast_channel *chan, const char *data)
 {
        int res = -1;
-       int format;
-
-       format = ast_best_codec(chan->nativeformats);
-       ast_set_write_format(chan, format);
-       ast_set_read_format(chan, format);
 
        while (ast_waitfor(chan, -1) > -1) {
                struct ast_frame *f = ast_read(chan);
-               if (!f)
+               if (!f) {
                        break;
+               }
                f->delivery.tv_sec = 0;
                f->delivery.tv_usec = 0;
-               if (ast_write(chan, f)) {
+               if (f->frametype != AST_FRAME_CONTROL
+                       && f->frametype != AST_FRAME_MODEM
+                       && f->frametype != AST_FRAME_NULL
+                       && ast_write(chan, f)) {
                        ast_frfree(f);
                        goto end;
                }
-               if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
+               if ((f->frametype == AST_FRAME_DTMF) && (f->subclass.integer == '#')) {
                        res = 0;
                        ast_frfree(f);
                        goto end;
@@ -83,7 +91,7 @@ static int unload_module(void)
 
 static int load_module(void)
 {
-       return ast_register_application(app, echo_exec, synopsis, descrip);
+       return ast_register_application_xml(app, echo_exec);
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Echo Application");