X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindow.C;fp=cinelerra-5.1%2Fcinelerra%2Fcwindow.C;h=f4c91c459f289bf7690c94913a87151a20337aae;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hp=022ee82e2b6c67b35e3afae617814911732b9eda;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/cwindow.C b/cinelerra-5.1/cinelerra/cwindow.C index 022ee82e..f4c91c45 100644 --- a/cinelerra-5.1/cinelerra/cwindow.C +++ b/cinelerra-5.1/cinelerra/cwindow.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 "autos.h" @@ -144,7 +144,7 @@ Track* CWindow::calculate_affected_track() return affected_track; } -Auto* CWindow::calculate_affected_auto(Autos *autos, +Auto* CWindow::calculate_affected_auto(Autos *autos, int create, int *created, int redraw) @@ -224,16 +224,16 @@ void CWindow::run() gui->run_window(); } -void CWindow::update(int position, - int overlays, - int tool_window, +void CWindow::update(int position, + int overlays, + int tool_window, int operation, int timebar) { if(position) { - playback_engine->que->send_command(CURRENT_FRAME, + playback_engine->que->send_command(CURRENT_FRAME, CHANGE_NONE, mwindow->edl, 1); @@ -273,9 +273,9 @@ void CWindow::update(int position, gui->zoom_panel->update(mwindow->edl->session->cwindow_zoom); gui->canvas->update_zoom(mwindow->edl->session->cwindow_xscroll, - mwindow->edl->session->cwindow_yscroll, + mwindow->edl->session->cwindow_yscroll, mwindow->edl->session->cwindow_zoom); - gui->canvas->reposition_window(mwindow->edl, + gui->canvas->reposition_window(mwindow->edl, mwindow->theme->ccanvas_x, mwindow->theme->ccanvas_y, mwindow->theme->ccanvas_w, @@ -296,7 +296,7 @@ int CWindow::update_position(double position) gui->unlock_window(); playback_engine->interrupt_playback(1); - + position = mwindow->edl->align_to_frame(position, 0); position = MAX(0, position); @@ -326,7 +326,7 @@ CWindowRemoteHandler:: int CWindowRemoteHandler::remote_process_key(RemoteControl *remote_control, int key) { MWindowGUI *mwindow_gui = remote_control->mwindow_gui; - EDL *edl = mwindow_gui->mwindow->edl; + EDL *edl = mwindow_gui->mwindow->edl; if( !edl ) return 0; PlayTransport *transport = mwindow_gui->mbuttons->transport; if( !transport->get_edl() ) return 0;