fixes merge error with Monitor calculation fix

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@246901 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 142a15acb1202653ac32b8063b53b8f93c1059d0..cf2e7ff2816ea5f663bb78079d4d304f484b0390 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3017,14 +3017,14 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 #ifndef MONITOR_CONSTANT_DELAY
                                        int jump = chan->outsmpl - chan->insmpl - 4 * f->samples;
                                        if (jump >= 0) {
-                                               jump = calc_monitor_jump((chan->outsmpl - chan->insmpl), ast_format_rate(f->subclass.codec), ast_format_rate(chan->monitor->read_stream->fmt->format));
+                                               jump = calc_monitor_jump((chan->outsmpl - chan->insmpl), ast_format_rate(f->subclass), ast_format_rate(chan->monitor->read_stream->fmt->format));
                                                if (ast_seekstream(chan->monitor->read_stream, jump, SEEK_FORCECUR) == -1)
                                                        ast_log(LOG_WARNING, "Failed to perform seek in monitoring read stream, synchronization between the files may be broken\n");
                                                chan->insmpl += (chan->outsmpl - chan->insmpl) + f->samples;
                                        } else
                                                chan->insmpl+= f->samples;
 #else
-                                       int jump = calc_monitor_jump((chan->outsmpl - chan->insmpl), ast_format_rate(f->subclass.codec), ast_format_rate(chan->monitor->read_stream->fmt->format));
+                                       int jump = calc_monitor_jump((chan->outsmpl - chan->insmpl), ast_format_rate(f->subclass), ast_format_rate(chan->monitor->read_stream->fmt->format));
                                        if (jump - MONITOR_DELAY >= 0) {
                                                if (ast_seekstream(chan->monitor->read_stream, jump - f->samples, SEEK_FORCECUR) == -1)
                                                        ast_log(LOG_WARNING, "Failed to perform seek in monitoring read stream, synchronization between the files may be broken\n");
@@ -3588,7 +3588,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
 #ifndef MONITOR_CONSTANT_DELAY
                                int jump = chan->insmpl - chan->outsmpl - 4 * cur->samples;
                                if (jump >= 0) {
-                                       jump = calc_monitor_jump((chan->insmpl - chan->outsmpl), ast_format_rate(f->subclass.codec), ast_format_rate(chan->monitor->read_stream->fmt->format));
+                                       jump = calc_monitor_jump((chan->insmpl - chan->outsmpl), ast_format_rate(f->subclass), ast_format_rate(chan->monitor->read_stream->fmt->format));
                                        if (ast_seekstream(chan->monitor->write_stream, jump, SEEK_FORCECUR) == -1)
                                                ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
                                        chan->outsmpl += (chan->insmpl - chan->outsmpl) + cur->samples;
@@ -3596,7 +3596,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
                                        chan->outsmpl += cur->samples;
                                }
 #else
-                               int jump = calc_monitor_jump((chan->insmpl - chan->outsmpl), ast_format_rate(f->subclass.codec), ast_format_rate(chan->monitor->read_stream->fmt->format));
+                               int jump = calc_monitor_jump((chan->insmpl - chan->outsmpl), ast_format_rate(f->subclass), ast_format_rate(chan->monitor->read_stream->fmt->format));
                                if (jump - MONITOR_DELAY >= 0) {
                                        if (ast_seekstream(chan->monitor->write_stream, jump - cur->samples, SEEK_FORCECUR) == -1)
                                                ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");