mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user