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/chan_unistim.c | |
| 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/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |