X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fshiftinterlace%2Fshiftinterlace.C;fp=cinelerra-5.1%2Fplugins%2Fshiftinterlace%2Fshiftinterlace.C;h=e7d93e7508cf80a89771a9eaf48169b32320d954;hp=3e6b57be001f15d73e5b2a367b1a29f05ffdc7c6;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d diff --git a/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C b/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C index 3e6b57be..e7d93e75 100644 --- a/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C +++ b/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.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 "bcdisplayinfo.h" @@ -49,10 +49,10 @@ public: int equivalent(ShiftInterlaceConfig &that); void copy_from(ShiftInterlaceConfig &that); - void interpolate(ShiftInterlaceConfig &prev, - ShiftInterlaceConfig &next, - long prev_frame, - long next_frame, + void interpolate(ShiftInterlaceConfig &prev, + ShiftInterlaceConfig &next, + long prev_frame, + long next_frame, long current_frame); @@ -109,7 +109,7 @@ public: void read_data(KeyFrame *keyframe); - void shift_row(VFrame *input_frame, + void shift_row(VFrame *input_frame, VFrame *output_frame, int offset, int row); @@ -147,10 +147,10 @@ void ShiftInterlaceConfig::copy_from(ShiftInterlaceConfig &that) even_offset = that.even_offset; } -void ShiftInterlaceConfig::interpolate(ShiftInterlaceConfig &prev, - ShiftInterlaceConfig &next, - long prev_frame, - long next_frame, +void ShiftInterlaceConfig::interpolate(ShiftInterlaceConfig &prev, + ShiftInterlaceConfig &next, + long prev_frame, + long next_frame, long current_frame) { double next_scale = (double)(current_frame - prev_frame) / (next_frame - prev_frame); @@ -167,16 +167,16 @@ void ShiftInterlaceConfig::interpolate(ShiftInterlaceConfig &prev, ShiftInterlaceWindow::ShiftInterlaceWindow(ShiftInterlaceMain *plugin) : PluginClientWindow(plugin, - 310, - 100, - 310, - 100, + 310, + 100, + 310, + 100, 0) { this->plugin = plugin; } - + void ShiftInterlaceWindow::create_objects() { int x = 10, y = 10; @@ -250,12 +250,12 @@ int ShiftInterlaceEven::handle_event() ShiftInterlaceMain::ShiftInterlaceMain(PluginServer *server) : PluginVClient(server) { - + } ShiftInterlaceMain::~ShiftInterlaceMain() { - + } @@ -314,7 +314,7 @@ void ShiftInterlaceMain::read_data(KeyFrame *keyframe) void ShiftInterlaceMain::update_gui() { - if(thread) + if(thread) { load_configuration(); thread->window->lock_window(); @@ -376,7 +376,7 @@ void ShiftInterlaceMain::update_gui() } -void ShiftInterlaceMain::shift_row(VFrame *input_frame, +void ShiftInterlaceMain::shift_row(VFrame *input_frame, VFrame *output_frame, int offset, int row)