diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:13:05 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:13:05 +0000 |
commit | d5a841f5ab5789d4a6f75e81966e085b5cf5b543 (patch) | |
tree | 329f543e4a5ff1d77b0f7d0d9297315df608314b /include/asterisk | |
parent | 3e8748117aa0389222d223b386e30ef894614281 (diff) |
Revert unnecessary indications API change from rev 122314
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@168561 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/channel.h | 2 | ||||
-rw-r--r-- | include/asterisk/indications.h | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 29b31b884..7ae0dbeb5 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -414,7 +414,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 ind_tone_zone *zone; /*!< Tone zone as set in indications.conf or + struct 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 ba342675e..be0635c90 100644 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -34,8 +34,8 @@ #include "asterisk/lock.h" -struct ind_tone_zone_sound { - struct ind_tone_zone_sound *next; /* next element */ +struct tone_zone_sound { + struct 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 ind_tone_zone_sound { specified in milliseconds */ }; -struct ind_tone_zone { - struct ind_tone_zone* next; /* next in list */ +struct tone_zone { + struct tone_zone* next; /* next in 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 ind_tone_zone_sound *tones; /* The known tones for this zone */ + struct tone_zone_sound *tones; /* The known tones for this zone */ }; /* set the default tone country */ int ast_set_indication_country(const char *country); /* locate ind_tone_zone, given the country. if country == NULL, use the default country */ -struct ind_tone_zone *ast_get_indication_zone(const char *country); -/* locate a ind_tone_zone_sound, given the ind_tone_zone. if ind_tone_zone == NULL, use the default ind_tone_zone */ -struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication); +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); /* add a new country, if country exists, it will be replaced. */ -int ast_register_indication_country(struct ind_tone_zone *country); +int ast_register_indication_country(struct 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 ind_tone_zone. ind_tone_zone must exist. if the indication already +/* 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); -/* remove an existing ind_tone_zone's indication. ind_tone_zone must exist */ -int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication); +int ast_register_indication(struct 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); /* 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 ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur); +struct tone_zone *ast_walk_indications(const struct tone_zone *cur); #if 0 -extern struct ind_tone_zone *ind_tone_zones; +extern struct tone_zone *tone_zones; extern ast_mutex_t tzlock; #endif |