diff options
Diffstat (limited to 'formats/format_g729.c')
-rw-r--r-- | formats/format_g729.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/formats/format_g729.c b/formats/format_g729.c index ad7d7fee7..22b3c3282 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -46,7 +46,7 @@ static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext) int res; /* Send a frame from the file to the appropriate channel */ s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass.codec = AST_FORMAT_G729A; + ast_format_set(&s->fr.subclass.format, AST_FORMAT_G729A, 0); s->fr.mallocd = 0; s->fr.samples = G729A_SAMPLES; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); @@ -66,8 +66,8 @@ static int g729_write(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_G729A) { - ast_log(LOG_WARNING, "Asked to write non-G729 frame (%s)!\n", ast_getformatname(f->subclass.codec)); + if (f->subclass.format.id != AST_FORMAT_G729A) { + ast_log(LOG_WARNING, "Asked to write non-G729 frame (%s)!\n", ast_getformatname(&f->subclass.format)); return -1; } if (f->datalen % 10) { @@ -121,10 +121,9 @@ static off_t g729_tell(struct ast_filestream *fs) return (offset/BUF_SIZE)*G729A_SAMPLES; } -static const struct ast_format g729_f = { +static struct ast_format_def g729_f = { .name = "g729", .exts = "g729", - .format = AST_FORMAT_G729A, .write = g729_write, .seek = g729_seek, .trunc = g729_trunc, @@ -135,14 +134,15 @@ static const struct ast_format g729_f = { static int load_module(void) { - if (ast_format_register(&g729_f)) + ast_format_set(&g729_f.format, AST_FORMAT_G729A, 0); + if (ast_format_def_register(&g729_f)) return AST_MODULE_LOAD_FAILURE; return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) { - return ast_format_unregister(g729_f.name); + return ast_format_def_unregister(g729_f.name); } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.729 data", |