X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fecho%2Fecho.C;h=d8b426d06d85a8fe250db210c3cc068028c8062f;hb=15ae384acd95de544db3986ace65e870b0c0b2c6;hp=f52849f5f43190e0ba027d362d5b08935d783113;hpb=64ee854bdef9fb08e6fec938aa0519715f724b99;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/echo/echo.C b/cinelerra-5.1/plugins/echo/echo.C index f52849f5..d8b426d0 100644 --- a/cinelerra-5.1/plugins/echo/echo.C +++ b/cinelerra-5.1/plugins/echo/echo.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 1997-2011 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" @@ -25,7 +25,7 @@ #include "bchash.h" #include "filexml.h" #include "language.h" -#include "cicolors.h" +#include "bccolors.h" #include "samples.h" #include "echo.h" #include "theme.h" @@ -61,7 +61,7 @@ void EchoConfig::copy_from(EchoConfig &that) offset = that.offset; } -void EchoConfig::interpolate(EchoConfig &prev, EchoConfig &next, +void EchoConfig::interpolate(EchoConfig &prev, EchoConfig &next, int64_t prev_frame, int64_t next_frame, int64_t current_frame) { double frames = next_frame - prev_frame; @@ -142,13 +142,13 @@ int EchoOffset::handle_event() void EchoWindow::create_objects() { int x = 170, y = 10; - add_subwindow(level_title=new EchoTitle(5, y + 10, _("Level: "), + add_subwindow(level_title=new EchoTitle(5, y + 10, _("Level: "), plugin->db.fromdb(plugin->config.level))); add_subwindow(level = new EchoLevel(this, x, y)); y += 25; add_subwindow(atten_title=new EchoTitle(5, y + 10, _("Atten: "), plugin->db.fromdb(plugin->config.atten))); add_subwindow(atten = new EchoAtten(this, x + 35, y)); y += 25; - add_subwindow(offset_title=new EchoTitle(5, y + 10, _("Offset: "), + add_subwindow(offset_title=new EchoTitle(5, y + 10, _("Offset: "), (int)plugin->config.offset)); add_subwindow(offset = new EchoOffset(this, x, y)); y += 25; show_window();