X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=239d11e10740aebe5ff51e1c350f780066a13638;hp=ce1bd3ec8f2452e2922d1f8281ab9e7d6ae84ced;hb=77bacac2bd6eaeb33b280458e0839b772f9ad18c;hpb=92b9d54385a64aa30400d5ccfe6374565bfe8e04 diff --git a/chan_lcr.c b/chan_lcr.c index ce1bd3e..239d11e 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -2584,14 +2584,14 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) struct ast_frame * f = fr; #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"); #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 +2604,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 +2683,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;