[asterisk-commits] russell: branch russell/indications r175737 - in /team/russell/indications: a...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Feb 13 16:30:38 2009
New Revision: 175737

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=175737
Log:
Make changes inspired by Mark's review

Modified:
    team/russell/indications/apps/app_playtones.c
    team/russell/indications/channels/chan_misdn.c
    team/russell/indications/include/asterisk/indications.h
    team/russell/indications/main/indications.c

Modified: team/russell/indications/apps/app_playtones.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/apps/app_playtones.c?view=diff&rev=175737&r1=175736&r2=175737
==============================================================================
--- team/russell/indications/apps/app_playtones.c (original)
+++ team/russell/indications/apps/app_playtones.c Fri Feb 13 16:30:38 2009
@@ -49,8 +49,8 @@
 			</parameter>
 		</syntax>
 		<description>
-			<para>Plays a tone list. Execution will continue with the next step immediately,
-			while the tones continue to play.</para>
+			<para>Plays a tone list. Execution will continue with the next step in the dialplan
+			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>

Modified: team/russell/indications/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/channels/chan_misdn.c?view=diff&rev=175737&r1=175736&r2=175737
==============================================================================
--- team/russell/indications/channels/chan_misdn.c (original)
+++ team/russell/indications/channels/chan_misdn.c Fri Feb 13 16:30:38 2009
@@ -3406,7 +3406,7 @@
 	ast_playtones_stop(ast);
 
 	if (cl->ts) {
-		cl->ts = ast_tone_zone_sound_unref((struct ast_tone_zone_sound *) cl->ts);
+		cl->ts = ast_tone_zone_sound_unref(cl->ts);
 	}
 
 	return 0;

Modified: team/russell/indications/include/asterisk/indications.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/include/asterisk/indications.h?view=diff&rev=175737&r1=175736&r2=175737
==============================================================================
--- team/russell/indications/include/asterisk/indications.h (original)
+++ team/russell/indications/include/asterisk/indications.h Fri Feb 13 16:30:38 2009
@@ -43,7 +43,7 @@
 	 *  - '!' - means that the element is NOT repeated
 	 *  - 'M' - interpret the frequencies as midi notes instead of frequencies
 	 *  - freq - The first frequency
-	 *  - freq2 - The second freency (optional)
+	 *  - freq2 - The second frequency (optional)
 	 *  - '*' - modulate freq by freq2 at a fixed depth of 90%
 	 *  - '+' - combine the frequencies
 	 *  - duration - the length of the tone part (optional, forever if not specified)

Modified: team/russell/indications/main/indications.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/indications/main/indications.c?view=diff&rev=175737&r1=175736&r2=175737
==============================================================================
--- team/russell/indications/main/indications.c (original)
+++ team/russell/indications/main/indications.c Fri Feb 13 16:30:38 2009
@@ -335,7 +335,10 @@
 			d.reppos = d.nitems;
 		}
 
-		if (ast_tone_zone_part_parse(s, &tone_data))
+		if (ast_tone_zone_part_parse(s, &tone_data)) {
+			ast_log(LOG_ERROR, "Failed to parse tone part '%s'\n", s);
+			continue;
+		}
 
 		if (tone_data.midinote) {
 			/* midi notes must be between 0 and 127 */
@@ -682,7 +685,7 @@
 	case CLI_INIT:
 		e->command = "indication remove";
 		e->usage =
-			"Usage: indication remove <country> <indication>\n"
+			"Usage: indication remove <country> [indication]\n"
 			"       Remove the given indication from the country.\n";
 		return NULL;
 	case CLI_GENERATE: