[asterisk-commits] russell: branch russell/indications r174744 - in /team/russell/indications: a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 10 14:37:00 CST 2009
Author: russell
Date: Tue Feb 10 14:37:00 2009
New Revision: 174744
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174744
Log:
Put the playtones apps into their own module
Added:
team/russell/indications/apps/app_playtones.c (with props)
Modified:
team/russell/indications/main/asterisk.c
team/russell/indications/main/indications.c
Added: team/russell/indications/apps/app_playtones.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/apps/app_playtones.c?view=auto&rev=174744
==============================================================================
--- team/russell/indications/apps/app_playtones.c (added)
+++ team/russell/indications/apps/app_playtones.c Tue Feb 10 14:37:00 2009
@@ -1,0 +1,128 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2009, Digium, Inc.
+ *
+ * Russell Bryant <russell at 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 Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*!
+ * \file
+ * \brief Playtones application
+ *
+ * \author Russell Bryant <russell at digium.com>
+ *
+ * \ingroup applications
+ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+#include "asterisk/channel.h"
+#include "asterisk/indications.h"
+
+static const char playtones_app[] = "PlayTones";
+static const char stopplaytones_app[] = "StopPlayTones";
+
+/*** DOCUMENTATION
+ <application name="PlayTones" language="en_US">
+ <synopsis>
+ Play a tone list.
+ </synopsis>
+ <syntax>
+ <parameter name="arg" required="true">
+ <para>Arg is either the tone name defined in the <filename>indications.conf</filename>
+ configuration file, or a directly specified list of frequencies and durations.</para>
+ </parameter>
+ </syntax>
+ <description>
+ <para>Plays a tone list. Execution will continue with the next step immediately,
+ while the tones continue to play.</para>
+ <para>See the sample <filename>indications.conf</filename> for a description of the
+ specification of a tonelist.</para>
+ </description>
+ <see-also>
+ <ref type="application">StopPlayTones</ref>
+ </see-also>
+ </application>
+ <application name="StopPlayTones" language="en_US">
+ <synopsis>
+ Stop playing a tone list.
+ </synopsis>
+ <syntax />
+ <description>
+ <para>Stop playing a tone list, initiated by PlayTones().</para>
+ </description>
+ <see-also>
+ <ref type="application">PlayTones</ref>
+ </see-also>
+ </application>
+ ***/
+
+static int handle_playtones(struct ast_channel *chan, void *data)
+{
+ struct ast_tone_zone_sound *ts;
+ int res;
+ const char *str = data;
+
+ if (ast_strlen_zero(str)) {
+ ast_log(LOG_NOTICE,"Nothing to play\n");
+ return -1;
+ }
+
+ ts = ast_get_indication_tone(chan->zone, str);
+
+ if (!ast_strlen_zero(ts->data)) {
+ res = ast_playtones_start(chan, 0, ts->data, 0);
+ } else {
+ res = ast_playtones_start(chan, 0, str, 0);
+ }
+
+ if (res) {
+ ast_log(LOG_NOTICE, "Unable to start playtones\n");
+ }
+
+ return res;
+}
+
+static int handle_stopplaytones(struct ast_channel *chan, void *data)
+{
+ ast_playtones_stop(chan);
+
+ return 0;
+}
+
+static int unload_module(void)
+{
+ int res;
+
+ res = ast_unregister_application(playtones_app);
+ res |= ast_unregister_application(stopplaytones_app);
+
+ return res;
+}
+
+static int load_module(void)
+{
+ int res;
+
+ res = ast_register_application_xml(playtones_app, handle_playtones);
+ res |= ast_register_application_xml(stopplaytones_app, handle_stopplaytones);
+
+ return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Playtones Application");
Propchange: team/russell/indications/apps/app_playtones.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/russell/indications/apps/app_playtones.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/russell/indications/apps/app_playtones.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/russell/indications/main/asterisk.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/main/asterisk.c?view=diff&rev=174744&r1=174743&r2=174744
==============================================================================
--- team/russell/indications/main/asterisk.c (original)
+++ team/russell/indications/main/asterisk.c Tue Feb 10 14:37:00 2009
@@ -3566,6 +3566,11 @@
exit(1);
}
+ if (ast_indications_init()) {
+ printf("%s", term_quit());
+ exit(1);
+ }
+
ast_features_init();
if (init_framer()) {
@@ -3579,11 +3584,6 @@
}
if (ast_enum_init()) {
- printf("%s", term_quit());
- exit(1);
- }
-
- if (ast_indications_init()) {
printf("%s", term_quit());
exit(1);
}
Modified: team/russell/indications/main/indications.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/main/indications.c?view=diff&rev=174744&r1=174743&r2=174744
==============================================================================
--- team/russell/indications/main/indications.c (original)
+++ team/russell/indications/main/indications.c Tue Feb 10 14:37:00 2009
@@ -40,41 +40,6 @@
#include "asterisk/astobj2.h"
#include "asterisk/_private.h" /* _init(), _reload() */
-
-/*** DOCUMENTATION
- <application name="PlayTones" language="en_US">
- <synopsis>
- Play a tone list.
- </synopsis>
- <syntax>
- <parameter name="arg" required="true">
- <para>Arg is either the tone name defined in the <filename>indications.conf</filename>
- configuration file, or a directly specified list of frequencies and durations.</para>
- </parameter>
- </syntax>
- <description>
- <para>Plays a tone list. Execution will continue with the next step immediately,
- while the tones continue to play.</para>
- <para>See the sample <filename>indications.conf</filename> for a description of the
- specification of a tonelist.</para>
- </description>
- <see-also>
- <ref type="application">StopPlayTones</ref>
- </see-also>
- </application>
- <application name="StopPlayTones" language="en_US">
- <synopsis>
- Stop playing a tone list.
- </synopsis>
- <syntax />
- <description>
- <para>Stop playing a tone list, initiated by PlayTones().</para>
- </description>
- <see-also>
- <ref type="application">PlayTones</ref>
- </see-also>
- </application>
- ***/
/* Globals */
static const char config[] = "indications.conf";
@@ -823,39 +788,6 @@
return CLI_SUCCESS;
}
-static int handle_playtones(struct ast_channel *chan, void *data)
-{
- struct ast_tone_zone_sound *ts;
- int res;
- const char *str = data;
-
- if (ast_strlen_zero(str)) {
- ast_log(LOG_NOTICE,"Nothing to play\n");
- return -1;
- }
-
- ts = ast_get_indication_tone(chan->zone, str);
-
- if (!ast_strlen_zero(ts->data)) {
- res = ast_playtones_start(chan, 0, ts->data, 0);
- } else {
- res = ast_playtones_start(chan, 0, str, 0);
- }
-
- if (res) {
- ast_log(LOG_NOTICE, "Unable to start playtones\n");
- }
-
- return res;
-}
-
-static int handle_stopplaytones(struct ast_channel *chan, void *data)
-{
- ast_playtones_stop(chan);
-
- return 0;
-}
-
static int is_valid_tone_zone(struct ast_tone_zone *zone)
{
int res;
@@ -1136,8 +1068,6 @@
}
ast_cli_register_multiple(cli_indications, ARRAY_LEN(cli_indications));
- ast_register_application_xml("PlayTones", handle_playtones);
- ast_register_application_xml("StopPlayTones", handle_stopplaytones);
return 0;
}
More information about the asterisk-commits
mailing list