diff options
| author | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
| commit | c26c190711a1bbe3b5fff1a93facae333757c56e (patch) | |
| tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /apps/app_alarmreceiver.c | |
| parent | 652fb64a01c7a8656697d07e606620ee0ced6929 (diff) | |
Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal. For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal
The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs. Functionally
no change in behavior should be present in this patch. Thanks to twilson
and russell for all the time they spent reviewing these changes.
Review: https://reviewboard.asterisk.org/r/1083/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_alarmreceiver.c')
| -rw-r--r-- | apps/app_alarmreceiver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 952ef722e..6936cb5a0 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -191,7 +191,7 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i if (f->frametype == AST_FRAME_VOICE) { wf.frametype = AST_FRAME_VOICE; - wf.subclass.codec = AST_FORMAT_ULAW; + ast_format_set(&wf.subclass.format, AST_FORMAT_ULAW, 0); wf.offset = AST_FRIENDLY_OFFSET; wf.mallocd = 0; wf.data.ptr = tone_block.buf; @@ -578,12 +578,12 @@ static int alarmreceiver_exec(struct ast_channel *chan, const char *data) /* Set write and read formats to ULAW */ ast_verb(4, "AlarmReceiver: Setting read and write formats to ULAW\n"); - if (ast_set_write_format(chan,AST_FORMAT_ULAW)) { + if (ast_set_write_format_by_id(chan,AST_FORMAT_ULAW)) { ast_log(LOG_WARNING, "AlarmReceiver: Unable to set write format to Mu-law on %s\n",chan->name); return -1; } - if (ast_set_read_format(chan,AST_FORMAT_ULAW)) { + if (ast_set_read_format_by_id(chan,AST_FORMAT_ULAW)) { ast_log(LOG_WARNING, "AlarmReceiver: Unable to set read format to Mu-law on %s\n",chan->name); return -1; } |