if(mwindow->session->drag_assets->total ||
mwindow->session->drag_clips->total)
{
- mwindow->gui->lock_window("CWindowGUI::drag_stop 5");
+ mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
mwindow->undo->update_undo_before(_("insert assets"), 0);
- mwindow->gui->unlock_window();
}
if(mwindow->session->drag_assets->total)
{
- mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
mwindow->clear(0);
mwindow->load_assets(mwindow->session->drag_assets,
mwindow->edl->local_session->get_selectionstart(),
if(mwindow->session->drag_clips->total)
{
- mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
mwindow->clear(0);
mwindow->paste_edls(mwindow->session->drag_clips,
LOADMODE_PASTE,
mwindow->gui->update(1, 1, 1, 1, 0, 1, 0);
mwindow->undo->update_undo_after(_("insert assets"), LOAD_ALL);
mwindow->gui->unlock_window();
- mwindow->sync_parameters(LOAD_ALL);
+ mwindow->sync_parameters(CHANGE_ALL);
}
}
in_x2 > in_x1 &&
in_y2 > in_y1)
{
+// input scaled from session to refresh frame coordinates
+ int ow = get_output_w(mwindow->edl);
+ int oh = get_output_h(mwindow->edl);
+ int rw = refresh_frame->get_w();
+ int rh = refresh_frame->get_h();
+ float xs = (float)rw / ow;
+ float ys = (float)rh / oh;
+ in_x1 *= xs; in_x2 *= xs;
+ in_y1 *= ys; in_y2 *= ys;
// Can't use OpenGL here because it is called asynchronously of the
// playback operation.
get_canvas()->draw_vframe(refresh_frame,
(int)out_x1,
(int)out_y1,
(int)(out_x2 - out_x1),
- (int)(out_y2 - out_y1));
-// if refresh_frame session geometry...
-// (int)in_x1,
-// (int)in_y1,
-// (int)(in_x2 - in_x1),
-// (int)(in_y2 - in_y1),
-// 0);
+ (int)(out_y2 - out_y1),
+ (int)in_x1,
+ (int)in_y1,
+ (int)(in_x2 - in_x1),
+ (int)(in_y2 - in_y1),
+ 0);
}
}
else