X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fcrossfade%2Fcrossfade.C;fp=cinelerra-5.1%2Fplugins%2Fcrossfade%2Fcrossfade.C;h=174053d979a3c24878a62a042a72002c408c50d1;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hp=105bb0838ac865ac9ed3659d3317b2617d458fc3;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/crossfade/crossfade.C b/cinelerra-5.1/plugins/crossfade/crossfade.C index 105bb083..174053d9 100644 --- a/cinelerra-5.1/plugins/crossfade/crossfade.C +++ b/cinelerra-5.1/plugins/crossfade/crossfade.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 "crossfade.h" @@ -49,11 +49,11 @@ int CrossfadeMain::uses_gui() { return 0; } -int CrossfadeMain::process_realtime(int64_t size, - Samples *outgoing, +int CrossfadeMain::process_realtime(int64_t size, + Samples *outgoing, Samples *incoming) { - double intercept = (double)PluginClient::get_source_position() / + double intercept = (double)PluginClient::get_source_position() / PluginClient::get_total_len(); double slope = (double)1 / PluginClient::get_total_len(); @@ -62,7 +62,7 @@ int CrossfadeMain::process_realtime(int64_t size, double *outgoing_samples = outgoing->get_data(); for(int i = 0; i < size; i++) { - incoming_samples[i] = outgoing_samples[i] * ((double)1 - (slope * i + intercept)) + + incoming_samples[i] = outgoing_samples[i] * ((double)1 - (slope * i + intercept)) + incoming_samples[i] * (slope * i + intercept); }