From 1b4ffa52484b48cd5af12e659ec12e32c8ebdaa8 Mon Sep 17 00:00:00 2001 From: rizzo Date: Mon, 25 Dec 2006 06:38:09 +0000 Subject: rename the structs struct tone_zone_sound and struct tone_zone defined in indications.h to ind_tone_zone_sound and ind_tone_zone, to avoid conflicts with the structs with the same names defined in tonezone.h Hope i haven't missed any instance. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48958 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/channel.h | 2 +- include/asterisk/indications.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 03613aadd..88897fd3b 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -442,7 +442,7 @@ struct ast_channel { struct ast_cdr *cdr; /*!< Call Detail Record */ enum ast_channel_adsicpe adsicpe; /*!< Whether or not ADSI is detected on CPE */ - struct tone_zone *zone; /*!< Tone zone as set in indications.conf or + struct ind_tone_zone *zone; /*!< Tone zone as set in indications.conf or in the CHANNEL dialplan function */ struct ast_channel_monitor *monitor; /*!< Channel monitoring */ diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h index 72561819c..4ed604c7d 100644 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -34,8 +34,8 @@ #include "asterisk/lock.h" -struct tone_zone_sound { - struct tone_zone_sound *next; /* next element */ +struct ind_tone_zone_sound { + struct ind_tone_zone_sound *next; /* next element */ const char *name; /* Identifing name */ const char *data; /* Actual zone description */ /* Description is a series of tones of the format: @@ -45,33 +45,33 @@ struct tone_zone_sound { specified in milliseconds */ }; -struct tone_zone { - AST_RWLIST_ENTRY(tone_zone) list; +struct ind_tone_zone { + AST_RWLIST_ENTRY(ind_tone_zone) list; char country[5]; /* Country code */ char alias[5]; /* is this an alias? */ char description[40]; /* Description */ int nrringcadence; /* # registered ringcadence elements */ int *ringcadence; /* Ring cadence */ - struct tone_zone_sound *tones; /* The known tones for this zone */ + struct ind_tone_zone_sound *tones; /* The known tones for this zone */ }; /* set the default tone country */ int ast_set_indication_country(const char *country); /* locate tone_zone, given the country. if country == NULL, use the default country */ -struct tone_zone *ast_get_indication_zone(const char *country); +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 tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication); +struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication); /* add a new country, if country exists, it will be replaced. */ -int ast_register_indication_country(struct tone_zone *country); +int ast_register_indication_country(struct ind_tone_zone *country); /* remove an existing country and all its indications, country must exist */ 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 tone_zone *zone, const char *indication, const char *tonelist); +int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist); /* remove an existing tone_zone's indication. tone_zone must exist */ -int ast_unregister_indication(struct tone_zone *zone, const char *indication); +int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication); /* Start a tone-list going */ int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, int interruptible); @@ -79,10 +79,10 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, void ast_playtones_stop(struct ast_channel *chan); /* support for walking through a list of indications */ -struct tone_zone *ast_walk_indications(const struct tone_zone *cur); +struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur); #if 0 -extern struct tone_zone *tone_zones; +extern struct ind_tone_zone *tone_zones; extern ast_mutex_t tzlock; #endif -- cgit v1.2.3