diff options
author | Russell Bryant <russell@russellbryant.com> | 2009-01-13 19:22:13 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2009-01-13 19:22:13 +0000 |
commit | ef6ad2b53cd60b14ef03d97f8cb393e2f245551f (patch) | |
tree | 15cf3668bbd9a4728dea0a1e537e636f0bda775f /include/asterisk | |
parent | f19a4fc94119064bbbd359875d0030214226fef6 (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@168562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/channel.h | 2 | ||||
-rw-r--r-- | include/asterisk/indications.h | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 3c3e0f6e1..c62a43ae8 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 be65b9ba9..b32fe500e 100644 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -39,41 +39,41 @@ 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 tone_zone_sound { const char *name; /*!< Identifing name */ const char *data; /*!< Actual zone description */ - AST_LIST_ENTRY(ind_tone_zone_sound) list; + AST_LIST_ENTRY(tone_zone_sound) list; }; -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 */ - AST_LIST_HEAD_NOLOCK(, ind_tone_zone_sound) tones; /*!< The known tones for this zone */ + AST_LIST_HEAD_NOLOCK(, 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 deallocate the passed tone zone */ -void ast_destroy_indication_zone(struct ind_tone_zone *zone); +void ast_destroy_indication_zone(struct tone_zone *zone); /*! \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); @@ -81,10 +81,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 |