diff options
Diffstat (limited to 'formats/format_siren14.c')
| -rw-r--r-- | formats/format_siren14.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/formats/format_siren14.c b/formats/format_siren14.c index 0b8526bde..53c9ea922 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -41,7 +41,7 @@ static struct ast_frame *siren14read(struct ast_filestream *s, int *whennext) /* Send a frame from the file to the appropriate channel */ s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass.codec = AST_FORMAT_SIREN14; + ast_format_set(&s->fr.subclass.format, AST_FORMAT_SIREN14, 0); s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { @@ -61,8 +61,8 @@ static int siren14write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); return -1; } - if (f->subclass.codec != AST_FORMAT_SIREN14) { - ast_log(LOG_WARNING, "Asked to write non-Siren14 frame (%s)!\n", ast_getformatname(f->subclass.codec)); + if (f->subclass.format.id != AST_FORMAT_SIREN14) { + ast_log(LOG_WARNING, "Asked to write non-Siren14 frame (%s)!\n", ast_getformatname(&f->subclass.format)); return -1; } if ((res = fwrite(f->data.ptr, 1, f->datalen, fs->f)) != f->datalen) { @@ -110,10 +110,9 @@ static off_t siren14tell(struct ast_filestream *fs) return BYTES_TO_SAMPLES(ftello(fs->f)); } -static const struct ast_format siren14_f = { +static struct ast_format_def siren14_f = { .name = "siren14", .exts = "siren14", - .format = AST_FORMAT_SIREN14, .write = siren14write, .seek = siren14seek, .trunc = siren14trunc, @@ -124,7 +123,8 @@ static const struct ast_format siren14_f = { static int load_module(void) { - if (ast_format_register(&siren14_f)) + ast_format_set(&siren14_f.format, AST_FORMAT_SIREN14, 0); + if (ast_format_def_register(&siren14_f)) return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_SUCCESS; @@ -132,7 +132,7 @@ static int load_module(void) static int unload_module(void) { - return ast_format_unregister(siren14_f.name); + return ast_format_def_unregister(siren14_f.name); } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)", |