add VFrameJpeg for shapewipe shapes, switch to jpeg for shapes, cam/prjr x,y,z range...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / trackcanvas.C

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 2ac5cccd290e6ee2c899d990b0ea5e5640df1679..a4faec2b9de802c3f6e168b833bebe443740bea2 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -1896,6 +1896,8 @@ void TrackCanvas::draw_hard_edges()
                for(Edit *edit = track->edits->first; edit; edit = edit->next) {
                        if( !edit->hard_left && !edit->hard_right ) continue;
                        edit_dimensions(edit, x, y, w, h);
+                       if( !MWindowGUI::visible(x, x + w, 0, get_w()) ||
+                           !MWindowGUI::visible(y, y + h, 0, get_h()) ) continue;
                        set_color(GREEN);
                        set_opaque();
                        int y1 = y;
@@ -3880,13 +3882,17 @@ int TrackCanvas::render_handle_frame(EDL *edl, int64_t pos, int mode)
                delete video_cache;
                mwindow->cwindow->gui->lock_window("TrackCanvas::render_handle_frame 0");
                Canvas *canvas = mwindow->cwindow->gui->canvas;
-               int w = canvas->w, h = canvas->h, w2 = w/2, h2 = h/2;
-               int lx = 0, ly = h2/2, rx = w2, ry = h2/2;
+               float ox1, oy1, ox2, oy2, cx1, cy1, cx2, cy2;
+               canvas->get_transfers(edl, ox1, oy1, ox2, oy2, cx1, cy1, cx2, cy2);
+               float cw = canvas->w/2, ch = canvas->h/2;
+               float cdx = (cx2 - cx1)/2, cdy = (cy2 - cy1)/2;
+               int cx = cx1/2, cy = cy1/2 + ch/2;
+               int ow = ox2 - ox2, oh = oy2 - oy1;
                BC_WindowBase *window = canvas->get_canvas();
                window->set_color(BLACK);
                window->clear_box(0,0, window->get_w(),window->get_h());
-               window->draw_vframe(&vlt, lx,ly, w2,h2, 0,0,vlt.get_w(),vlt.get_h());
-               window->draw_vframe(&vrt, rx,ry, w2,h2, 0,0,vrt.get_w(),vrt.get_h());
+               window->draw_vframe(&vlt, cx,cy, cdx,cdy, ox1,oy1, ow,oh);  cx += cw;
+               window->draw_vframe(&vrt, cx,cy, cdx,cdy, ox1,oy1, ow,oh);
                window->flash(1);
                mwindow->cwindow->gui->unlock_window();
                break; }