X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindow.C;h=b6dc23c685bae7052b21a4b02e768a072d70f08f;hb=02a79c110b1bce1d500849c82b2098863cd60424;hp=98858289849a63660bd850ae3388a57057613851;hpb=f007a674187f11ab58a5aebfe1eec27a90398bcb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C index 98858289..b6dc23c6 100644 --- a/cinelerra-5.1/cinelerra/vwindow.C +++ b/cinelerra-5.1/cinelerra/vwindow.C @@ -77,26 +77,20 @@ void VWindow::delete_source(int do_main_edl, int update_gui) //printf("VWindow::delete_source %d %d %p %p\n", __LINE__, gui->get_window_lock(), edl, indexable); if(do_main_edl) mwindow->edl->remove_vwindow_edl(get_edl()); - if(edl) - { + if( edl ) { edl->Garbage::remove_user(); -//printf("VWindow::delete_source %d\n", __LINE__); edl = 0; } -// if(mwindow->edl->vwindow_edl && !mwindow->edl->vwindow_edl_shared) -// { -// mwindow->edl->vwindow_edl->Garbage::remove_user(); -// mwindow->edl->vwindow_edl = 0; -// mwindow->edl->vwindow_edl_shared = 0; -// } - -//printf("VWindow::delete_source %d\n", __LINE__); - if(indexable) indexable->Garbage::remove_user(); - indexable = 0; + if( indexable ) { + indexable->Garbage::remove_user(); + indexable = 0; + } - if(update_gui) gui->change_source(0, _("Viewer")); -//printf("VWindow::delete_source %d\n", __LINE__); + if( update_gui ) { + gui->change_source(0, _("Viewer")); + gui->clock->clear(); + } } @@ -262,7 +256,8 @@ void VWindow::change_source(EDL *edl) mwindow->edl->append_vwindow_edl(edl, 1); this->edl = edl; this->edl->Garbage::add_user(); - + edl->local_session->preview_start = 0; + edl->local_session->preview_end = -1; // mwindow->edl->vwindow_edl = edl; // in order not to later delete edl if it is shared // edl->Garbage::add_user();