X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=7269a0ff38bc5f0bf976928155279912bcd9a3c4;hp=ce1bd3ec8f2452e2922d1f8281ab9e7d6ae84ced;hb=e9dd99a40139791057444e745591e3568b34a445;hpb=affef8c1e15dc62feae592b9c80c405eb67086ec diff --git a/chan_lcr.c b/chan_lcr.c index ce1bd3e..7269a0f 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -2583,15 +2583,17 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) struct chan_call *call; struct ast_frame * f = fr; +#if ASTERISK_VERSION_NUM < 100000 #ifdef AST_1_8_OR_HIGHER - if (!f->subclass.integer) + if (!f->subclass.codec) #else if (!f->subclass) #endif CDEBUG(NULL, ast, "No subclass\n"); +#endif #ifdef AST_1_8_OR_HIGHER #if ASTERISK_VERSION_NUM < 100000 - if (!(f->subclass.integer & ast->nativeformats)) { + if (!(f->subclass.codec & ast->nativeformats)) { #else if (!ast_format_cap_iscompatible(ast->nativeformats, &f->subclass.format)) { #endif @@ -2604,7 +2606,7 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) #ifdef AST_1_8_OR_HIGHER #if ASTERISK_VERSION_NUM < 100000 - ast_set_write_format(ast, f->subclass.integer); + ast_set_write_format(ast, f->subclass.codec); #else ast_set_write_format(ast, &f->subclass.format); #endif @@ -2683,7 +2685,7 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) call->read_fr.frametype = AST_FRAME_VOICE; #ifdef AST_1_8_OR_HIGHER #if ASTERISK_VERSION_NUM < 100000 - call->read_fr.subclass.integer = ast->nativeformats; + call->read_fr.subclass.codec = ast->nativeformats; #else ast_best_codec(ast->nativeformats, &call->read_fr.subclass.format); call->read_fr.subclass.integer = call->read_fr.subclass.format.id;