@ -337,12 +337,12 @@ void ast_playtones_stop(struct ast_channel *chan)
/*--------------------------------------------*/
static AST_RWLIST_HEAD_STATIC ( tone_zones , tone_zone) ;
static struct tone_zone * current_tonezone ;
static AST_RWLIST_HEAD_STATIC ( tone_zones , ind_ tone_zone) ;
static struct ind_ tone_zone * current_tonezone ;
struct tone_zone * ast_walk_indications ( const struct tone_zone * cur )
struct ind_ tone_zone * ast_walk_indications ( const struct ind_ tone_zone * cur )
{
struct tone_zone * tz = NULL ;
struct ind_ 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 */
@ -363,7 +363,7 @@ struct tone_zone *ast_walk_indications(const struct tone_zone *cur)
/* Set global indication country */
int ast_set_indication_country ( const char * country )
{
struct tone_zone * zone = NULL ;
struct ind_ 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 ) ) )
@ -382,9 +382,9 @@ 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 )
{
struct tone_zone * tz = NULL ;
struct ind_ tone_zone * tz = NULL ;
int alias_loop = 0 ;
AST_RWLIST_RDLOCK ( & tone_zones ) ;
@ -418,9 +418,9 @@ struct 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 )
{
struct tone_zone_sound * ts = NULL ;
struct ind_ tone_zone_sound * ts = NULL ;
AST_RWLIST_RDLOCK ( & tone_zones ) ;
@ -447,10 +447,10 @@ struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, co
}
/* helper function to delete a tone_zone in its entirety */
static inline void free_zone ( struct tone_zone* zone )
static inline void free_zone ( struct ind_ tone_zone* zone )
{
while ( zone - > tones ) {
struct tone_zone_sound * tmp = zone - > tones - > next ;
struct ind_ tone_zone_sound * tmp = zone - > tones - > next ;
free ( ( void * ) zone - > tones - > name ) ;
free ( ( void * ) zone - > tones - > data ) ;
free ( zone - > tones ) ;
@ -466,9 +466,9 @@ static inline void free_zone(struct tone_zone* zone)
/*--------------------------------------------*/
/* add a new country, if country exists, it will be replaced. */
int ast_register_indication_country ( struct tone_zone * zone )
int ast_register_indication_country ( struct ind_ tone_zone * zone )
{
struct tone_zone * tz = NULL ;
struct ind_ tone_zone * tz = NULL ;
AST_RWLIST_WRLOCK ( & tone_zones ) ;
AST_RWLIST_TRAVERSE_SAFE_BEGIN ( & tone_zones , tz , list ) {
@ -502,7 +502,7 @@ int ast_register_indication_country(struct 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 tone_zone * tz = NULL ;
struct ind_ tone_zone * tz = NULL ;
int res = - 1 ;
AST_RWLIST_WRLOCK ( & tone_zones ) ;
@ -529,9 +529,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 tone_zone * zone , const char * indication , const char * tonelist )
int ast_register_indication ( struct ind_ tone_zone * zone , const char * indication , const char * tonelist )
{
struct tone_zone_sound * ts , * ps ;
struct ind_ tone_zone_sound * ts , * ps ;
/* is it an alias? stop */
if ( zone - > alias [ 0 ] )
@ -567,9 +567,9 @@ int ast_register_indication(struct tone_zone *zone, const char *indication, cons
}
/* remove an existing country's indication. Both country and indication 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 )
{
struct tone_zone_sound * ts , * ps = NULL , * tmp ;
struct ind_ tone_zone_sound * ts , * ps = NULL , * tmp ;
int res = - 1 ;
/* is it an alias? stop */