kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 168561 via svnmerge from

Browse Source 
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:
Russell Bryant
2009-01-13 19:22:13 +00:00
parent f19a4fc941
commit ef6ad2b53c
15 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_misdn.c
View File

@@ -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)
@@ -3280,7 +3280,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;

2
channels/chan_skinny.c
View File

@@ -3767,7 +3767,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) {

6
channels/chan_unistim.c
View File

@@ -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);