Merged revisions 168562 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines

Merged revisions 168561 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines

Revert unnecessary indications API change from rev 122314

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168565 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 21 insertions, 21 deletions

diff --git a/main/app.c b/main/app.c
index aecbffaf2..24a1de13e 100644
--- a/main/app.c
+++ b/main/app.c
@@ -65,7 +65,7 @@ static AST_RWLIST_HEAD_STATIC(groups, ast_group_info);
 */
 int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout) 
 {
-	struct ind_tone_zone_sound *ts;
+	struct tone_zone_sound *ts;
 	int res = 0, x = 0;
 
 	if (maxlen > size)
diff --git a/main/channel.c b/main/channel.c
index 1f7ca712b..6199b99a4 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2877,7 +2877,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
 	/* By using an enum, we'll get compiler warnings for values not handled 
 	 * in switch statements. */
 	enum ast_control_frame_type condition = _condition;
-	const struct ind_tone_zone_sound *ts = NULL;
+	const struct tone_zone_sound *ts = NULL;
 	int res = -1;
 
 	ast_channel_lock(chan);
diff --git a/main/indications.c b/main/indications.c
index 28c778ad1..1769dce6d 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -332,12 +332,12 @@ void ast_playtones_stop(struct ast_channel *chan)
 
 /*--------------------------------------------*/
 
-static AST_RWLIST_HEAD_STATIC(tone_zones, ind_tone_zone);
-static struct ind_tone_zone *current_tonezone;
+static AST_RWLIST_HEAD_STATIC(tone_zones, tone_zone);
+static struct tone_zone *current_tonezone;
 
-struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur)
+struct tone_zone *ast_walk_indications(const struct tone_zone *cur)
 {
-	struct ind_tone_zone *tz = NULL;
+	struct tone_zone *tz = NULL;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
 	/* If cur is not NULL, then we have to iterate through - otherwise just return the first entry */
@@ -358,7 +358,7 @@ struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur)
 /* Set global indication country */
 int ast_set_indication_country(const char *country)
 {
-	struct ind_tone_zone *zone = NULL;
+	struct tone_zone *zone = NULL;
 
 	/* If no country is specified or we are unable to find the zone, then return not found */
 	if (!country || !(zone = ast_get_indication_zone(country)))
@@ -376,9 +376,9 @@ int ast_set_indication_country(const char *country)
 }
 
 /* locate tone_zone, given the country. if country == NULL, use the default country */
-struct ind_tone_zone *ast_get_indication_zone(const char *country)
+struct tone_zone *ast_get_indication_zone(const char *country)
 {
-	struct ind_tone_zone *tz = NULL;
+	struct tone_zone *tz = NULL;
 	int alias_loop = 0;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
@@ -411,9 +411,9 @@ struct ind_tone_zone *ast_get_indication_zone(const char *country)
 }
 
 /* locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */
-struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication)
+struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication)
 {
-	struct ind_tone_zone_sound *ts = NULL;
+	struct tone_zone_sound *ts = NULL;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
 
@@ -440,10 +440,10 @@ struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *
 }
 
 /* helper function to delete a tone_zone in its entirety */
-static inline void free_zone(struct ind_tone_zone* zone)
+static inline void free_zone(struct tone_zone* zone)
 {
 	while (zone->tones) {
-		struct ind_tone_zone_sound *tmp = zone->tones->next;
+		struct tone_zone_sound *tmp = zone->tones->next;
 		ast_free((void *)zone->tones->name);
 		ast_free((void *)zone->tones->data);
 		ast_free(zone->tones);
@@ -459,9 +459,9 @@ static inline void free_zone(struct ind_tone_zone* zone)
 /*--------------------------------------------*/
 
 /* add a new country, if country exists, it will be replaced. */
-int ast_register_indication_country(struct ind_tone_zone *zone)
+int ast_register_indication_country(struct tone_zone *zone)
 {
-	struct ind_tone_zone *tz = NULL;
+	struct tone_zone *tz = NULL;
 
 	AST_RWLIST_WRLOCK(&tone_zones);
 	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&tone_zones, tz, list) {
@@ -494,7 +494,7 @@ int ast_register_indication_country(struct ind_tone_zone *zone)
  * Also, all countries which are an alias for the specified country are removed. */
 int ast_unregister_indication_country(const char *country)
 {
-	struct ind_tone_zone *tz = NULL;
+	struct tone_zone *tz = NULL;
 	int res = -1;
 
 	AST_RWLIST_WRLOCK(&tone_zones);
@@ -520,9 +520,9 @@ int ast_unregister_indication_country(const char *country)
 
 /* add a new indication to a tone_zone. tone_zone must exist. if the indication already
  * exists, it will be replaced. */
-int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist)
+int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist)
 {
-	struct ind_tone_zone_sound *ts, *ps;
+	struct tone_zone_sound *ts, *ps;
 
 	/* is it an alias? stop */
 	if (zone->alias[0])
@@ -558,9 +558,9 @@ int ast_register_indication(struct ind_tone_zone *zone, const char *indication,
 }
 
 /* remove an existing country's indication. Both country and indication must exist */
-int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication)
+int ast_unregister_indication(struct tone_zone *zone, const char *indication)
 {
-	struct ind_tone_zone_sound *ts,*ps = NULL, *tmp;
+	struct tone_zone_sound *ts,*ps = NULL, *tmp;
 	int res = -1;
 
 	/* is it an alias? stop */
diff --git a/main/pbx.c b/main/pbx.c
index 913538a4d..e944aa174 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7996,7 +7996,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
 	} else if (ast_test_flag(&flags, WAITEXTEN_MOH)) {
 		ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0]));
 	} else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
-		const struct ind_tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
+		const struct tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
 		if (ts)
 			ast_playtones_start(chan, 0, ts->data, 0);
 		else