X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Freframe%2Freframe.C;h=62b14197d38967b866f6789f0eefcbca107d3f77;hp=621c59a4005e8f5a91f6a2a02633a742127c5740;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/plugins/reframe/reframe.C b/cinelerra-5.1/plugins/reframe/reframe.C index 621c59a4..62b14197 100644 --- a/cinelerra-5.1/plugins/reframe/reframe.C +++ b/cinelerra-5.1/plugins/reframe/reframe.C @@ -2,25 +2,26 @@ /* * 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" #include "bchash.h" +#include "file.h" #include "language.h" #include "mainprogress.h" #include "reframe.h" @@ -59,7 +60,7 @@ int ReFrame::load_defaults() char directory[1024]; // set the default directory - sprintf(directory, "%sreframe.rc", BCASTDIR); + sprintf(directory, "%s/reframe.rc", File::get_config_path()); // load the defaults @@ -84,7 +85,7 @@ int ReFrame::get_parameters() ReFrameWindow window(this, info.get_abs_cursor_x(), info.get_abs_cursor_y()); window.create_objects(); int result = window.run_window(); - + return result; } @@ -95,7 +96,7 @@ int ReFrame::start_loop() { char string[BCTEXTLEN]; sprintf(string, "%s...", plugin_title()); - progress = start_progress(string, + progress = start_progress(string, (PluginClient::end - PluginClient::start)); } @@ -117,19 +118,19 @@ int ReFrame::stop_loop() int ReFrame::process_loop(VFrame *buffer) { int result = 0; - - int64_t input_offset = Units::to_int64((double)current_position * - scale + + + int64_t input_offset = Units::to_int64((double)current_position * + scale + PluginClient::start); read_frame(buffer, input_offset); current_position++; - input_offset = Units::to_int64((double)current_position * - scale + + input_offset = Units::to_int64((double)current_position * + scale + PluginClient::start); - if(PluginClient::interactive) + if(PluginClient::interactive) result = progress->update(input_offset - PluginClient::start); if(input_offset >= PluginClient::end) result = 1; @@ -163,14 +164,14 @@ int ReFrameOutput::handle_event() ReFrameWindow::ReFrameWindow(ReFrame *plugin, int x, int y) - : BC_Window(plugin->plugin_title(), - x, - y, - 230, - 160, - 230, - 160, - 0, + : BC_Window(plugin->plugin_title(), + x, + y, + 230, + 160, + 230, + 160, + 0, 0, 1) {