diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:35:59 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:35:59 +0000 |
commit | ea86ed1263ec076f14681226c4f52dc1f70489c3 (patch) | |
tree | 6965bcb0befaa661d965f52f7a917aa1d502a399 /include | |
parent | c74e090245d4327130e492e495769d5b3b81836b (diff) |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/channel.h | 2 | ||||
-rw-r--r-- | include/asterisk/indications.h | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index cc6c334ef..ff8521c00 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -424,7 +424,7 @@ struct ast_channel { struct ast_trans_pvt *readtrans; /*!< Read translation path */ struct ast_audiohook_list *audiohooks; struct ast_cdr *cdr; /*!< Call Detail Record */ - 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 */ #ifdef HAVE_EPOLL diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h index 2841a9fdf..9a1b19819 100644 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -39,39 +39,39 @@ are no spaces. The sequence is repeated back to the first tone description not preceeded by !. Duration is specified in milliseconds */ -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 */ }; -struct ind_tone_zone { - AST_RWLIST_ENTRY(ind_tone_zone) list; +struct tone_zone { + AST_RWLIST_ENTRY(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 ind_tone_zone_sound *tones; /*!< The known tones for this zone */ + struct tone_zone_sound *tones; /*!< The known tones for this zone */ }; /*! \brief set the default tone country */ int ast_set_indication_country(const char *country); /*! \brief 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); /*! \brief 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); /*! \brief 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); /*! \brief remove an existing country and all its indications, country must exist */ int ast_unregister_indication_country(const char *country); /*! \brief 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); /*! \brief remove an existing tone_zone's indication. tone_zone 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); /*! \brief 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); /*! \brief 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 *tone_zones; +extern struct tone_zone *tone_zones; extern ast_mutex_t tzlock; #endif |