X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frecordscopes.C;h=65f50b1e8ded9334e65e0d9872df8725e6c3c8cf;hp=4a3cebf9258bde18d0e1c033fa6ad7fa7db10255;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/cinelerra/recordscopes.C b/cinelerra-5.1/cinelerra/recordscopes.C index 4a3cebf9..65f50b1e 100644 --- a/cinelerra-5.1/cinelerra/recordscopes.C +++ b/cinelerra-5.1/cinelerra/recordscopes.C @@ -1,32 +1,34 @@ /* * 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 "cicolors.h" +#include "bctheme.h" +#include "bccolors.h" #include "language.h" #include "mainsession.h" #include "mutex.h" #include "preferences.h" #include "recordmonitor.h" #include "recordscopes.h" +#include "theme.h" RecordScopeThread::RecordScopeThread(MWindow *mwindow, RecordMonitor *record_monitor) : BC_DialogThread() @@ -48,7 +50,7 @@ void RecordScopeThread::handle_done_event(int result) gui_lock->lock("RecordScopeThread::handle_done_event"); scope_gui = 0; gui_lock->unlock(); - + record_monitor->window->lock_window("RecordScopeThread::handle_done_event"); record_monitor->window->scope_toggle->update(0); record_monitor->window->unlock_window(); @@ -87,12 +89,12 @@ void RecordScopeThread::process(VFrame *output_frame) -RecordScopeGUI::RecordScopeGUI(MWindow *mwindow, +RecordScopeGUI::RecordScopeGUI(MWindow *mwindow, RecordMonitor *record_monitor) - : ScopeGUI(mwindow->theme, - mwindow->session->scope_x, - mwindow->session->scope_y, - mwindow->session->scope_w, + : ScopeGUI(mwindow->theme, + mwindow->session->scope_x, + mwindow->session->scope_y, + mwindow->session->scope_w, mwindow->session->scope_h, mwindow->preferences->processors) { @@ -145,8 +147,8 @@ int RecordScopeGUI::resize_event(int w, int h) ScopeEnable::ScopeEnable(MWindow *mwindow, RecordMonitor *record_monitor, int x, int y) - : BC_Toggle(x, - y, + : BC_Toggle(x, + y, mwindow->theme ? mwindow->theme->get_image_set("scope_toggle") : 0, mwindow->session->record_scope) {