From ef6ad2b53cd60b14ef03d97f8cb393e2f245551f Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 13 Jan 2009 19:22:13 +0000 Subject: 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 --- channels/chan_unistim.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels/chan_unistim.c') diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index bd15f2896..13c397808 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); -- cgit v1.2.3