X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fdissolve%2Fdissolve.C;h=e2e0d532d18d3156dd0bbd7e326af031d638fb3f;hb=b75f0c6910f5f1e1094f17874cd404e3f0faee8c;hp=c0dbb7508dbd867cb1bd25f21ca21913f63235eb;hpb=5820b5f022aeec75ec03f7dd0121aa8a3d7f7590;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/dissolve/dissolve.C b/cinelerra-5.1/plugins/dissolve/dissolve.C index c0dbb750..e2e0d532 100644 --- a/cinelerra-5.1/plugins/dissolve/dissolve.C +++ b/cinelerra-5.1/plugins/dissolve/dissolve.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "dissolve.h" @@ -56,7 +56,7 @@ int DissolveMain::uses_gui() { return 0; } int DissolveMain::process_realtime(VFrame *incoming, VFrame *outgoing) { - fade = (float)PluginClient::get_source_position() / + fade = (float)PluginClient::get_source_position() / PluginClient::get_total_len(); // Use hardware @@ -69,7 +69,7 @@ int DissolveMain::process_realtime(VFrame *incoming, VFrame *outgoing) // Use software if(!overlayer) overlayer = new OverlayFrame(get_project_smp() + 1); - overlayer->overlay(outgoing, incoming, + overlayer->overlay(outgoing, incoming, 0, 0, incoming->get_w(), incoming->get_h(), 0, 0, incoming->get_w(), incoming->get_h(), fade, TRANSFER_SRC, NEAREST_NEIGHBOR);