Rework channel structure to eliminate "pvt" portion of channel (bug #3573)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5137 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-04 06:47:24 +00:00
parent fba0b595ab
commit 18d9b26cf9
35 changed files with 1224 additions and 956 deletions

View File

@@ -22,7 +22,6 @@
#include <asterisk/sched.h>
#include <asterisk/options.h>
#include <asterisk/channel.h>
#include <asterisk/channel_pvt.h>
#include <asterisk/logger.h>
#include <asterisk/file.h>
#include <asterisk/image.h>
@@ -69,9 +68,9 @@ void ast_image_unregister(struct ast_imager *img)
int ast_supports_images(struct ast_channel *chan)
{
if (!chan || !chan->pvt)
if (!chan || !chan->tech)
return 0;
if (!chan->pvt->send_image)
if (!chan->tech->send_image)
return 0;
return 1;
}
@@ -162,10 +161,10 @@ int ast_send_image(struct ast_channel *chan, char *filename)
{
struct ast_frame *f;
int res = -1;
if (chan->pvt->send_image) {
if (chan->tech->send_image) {
f = ast_read_image(filename, chan->language, -1);
if (f) {
res = chan->pvt->send_image(chan, f);
res = chan->tech->send_image(chan, f);
ast_frfree(f);
}
}