X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=e3f323c526e08acd98c56b05b5e682376a317e89;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=58f0ef946fd806c64061ae4219f5834f51348614;hpb=4a90ef3ae46465c0634f81916b79e279e4bd9961;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index 58f0ef94..e3f323c5 100644 --- a/cinelerra-5.1/cinelerra/vwindowgui.C +++ b/cinelerra-5.1/cinelerra/vwindowgui.C @@ -112,6 +112,7 @@ void VWindowGUI::draw_wave() int w = mwindow->edl->session->output_w; int h = mwindow->edl->session->output_h; VFrame *vframe = new VFrame(w, h, BC_RGB888); + vframe->clear_frame(); int sample_rate = mwindow->edl->get_sample_rate(); int channels = mwindow->edl->session->audio_channels; if( channels > 2 ) channels = 2; @@ -200,9 +201,9 @@ void VWindowGUI::update_sources(const char *title) void VWindowGUI::create_objects() { + lock_window("VWindowGUI::create_objects"); in_point = 0; out_point = 0; - lock_window("VWindowGUI::create_objects"); set_icon(mwindow->theme->get_image("vwindow_icon")); //printf("VWindowGUI::create_objects 1\n"); @@ -567,7 +568,7 @@ VWindowEditing::~VWindowEditing() void VWindowEditing::copy_selection() { - vwindow->copy(); + vwindow->copy(subwindow->shift_down()); } void VWindowEditing::splice_selection() @@ -575,7 +576,7 @@ void VWindowEditing::splice_selection() if(vwindow->get_edl()) { mwindow->gui->lock_window("VWindowEditing::splice_selection"); - mwindow->splice(vwindow->get_edl()); + mwindow->splice(vwindow->get_edl(), subwindow->shift_down()); mwindow->gui->unlock_window(); } } @@ -585,7 +586,7 @@ void VWindowEditing::overwrite_selection() if(vwindow->get_edl()) { mwindow->gui->lock_window("VWindowEditing::overwrite_selection"); - mwindow->overwrite(vwindow->get_edl()); + mwindow->overwrite(vwindow->get_edl(), subwindow->shift_down()); mwindow->gui->unlock_window(); } } @@ -703,7 +704,7 @@ void VWindowEditing::to_clip() { EDL *edl = vwindow->get_edl(); if( !edl ) return; - mwindow->to_clip(edl, _("viewer window: ")); + mwindow->to_clip(edl, _("viewer window: "), subwindow->shift_down()); } VWindowSource::VWindowSource(MWindow *mwindow, VWindowGUI *vwindow, int x, int y)