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 /channels | |
| 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 'channels')
| -rw-r--r-- | channels/chan_misdn.c | 4 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 2 | ||||
| -rw-r--r-- | channels/chan_unistim.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index fc4a2df10..e77800bb8 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -377,7 +377,7 @@ struct chan_list { * \brief Tone zone sound used for dialtone generation. * \note Used as a boolean. Non-NULL to prod generation if enabled. */ - const struct ind_tone_zone_sound *ts; + const struct tone_zone_sound *ts; /*! * \brief Enables overlap dialing for the set amount of seconds. (0 = Disabled) @@ -3289,7 +3289,7 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, static int dialtone_indicate(struct chan_list *cl) { - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; struct ast_channel *ast = cl->ast; int nd = 0; diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6ac36c9b5..56286dbe4 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3768,7 +3768,7 @@ static int skinny_transfer(struct skinny_subchannel *sub) { struct skinny_subchannel *xferor; /* the sub doing the transferring */ struct skinny_subchannel *xferee; /* the sub being transferred */ - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; if (ast_bridged_channel(sub->owner) || ast_bridged_channel(sub->related->owner)) { if (sub->xferor) { diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index a605c6be7..1818f91aa 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -439,7 +439,7 @@ static struct unistim_device { char datetimeformat; /*!< format used for displaying time/date */ char contrast; /*!< contrast */ char country[3]; /*!< country used for dial tone frequency */ - struct ind_tone_zone *tz; /*!< Tone zone for res_indications (ring, busy, congestion) */ + struct tone_zone *tz; /*!< Tone zone for res_indications (ring, busy, congestion) */ char ringvolume; /*!< Ring volume */ char ringstyle; /*!< Ring melody */ int rtp_port; /*!< RTP port used by the phone */ @@ -4057,10 +4057,10 @@ static char *control2str(int ind) return "UNKNOWN"; } -static void in_band_indication(struct ast_channel *ast, const struct ind_tone_zone *tz, +static void in_band_indication(struct ast_channel *ast, const struct tone_zone *tz, const char *indication) { - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; ts = ast_get_indication_tone(tz, indication); |