projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mask selection btns
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
cwindow.C
diff --git
a/cinelerra-5.1/cinelerra/cwindow.C
b/cinelerra-5.1/cinelerra/cwindow.C
index 7667690fa78eb235697e9cda713d630926e5d4d5..9fed729273ac69bb3a002661d02dfc68f5d69035 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindow.C
+++ b/
cinelerra-5.1/cinelerra/cwindow.C
@@
-59,6
+59,9
@@
CWindow::CWindow(MWindow *mwindow)
: Thread(1, 0, 0)
{
this->mwindow = mwindow;
: Thread(1, 0, 0)
{
this->mwindow = mwindow;
+ this->playback_engine = 0;
+ this->playback_cursor = 0;
+ this->gui = 0;
}
}
@@
-211,24
+214,24
@@
void CWindow::run()
void CWindow::update(int dir, int overlays, int tool_window, int operation, int timebar)
{
void CWindow::update(int dir, int overlays, int tool_window, int operation, int timebar)
{
- if(
dir
)
+ if(
dir
)
refresh_frame(CHANGE_NONE, dir);
gui->lock_window("CWindow::update 2");
// Create tool window
refresh_frame(CHANGE_NONE, dir);
gui->lock_window("CWindow::update 2");
// Create tool window
- if(
operation
)
+ if(
operation
)
gui->set_operation(mwindow->edl->session->cwindow_operation);
// Updated by video device.
gui->set_operation(mwindow->edl->session->cwindow_operation);
// Updated by video device.
- if(
overlays && !dir
)
- gui->canvas->
draw_refresh(
);
+ if(
overlays && !dir
)
+ gui->canvas->
refresh(1
);
// Update tool parameters
// Never updated by someone else
// Update tool parameters
// Never updated by someone else
- if(
tool_window || dir
)
+ if(
tool_window || dir
)
gui->update_tool();
gui->update_tool();
- if(
timebar
)
+ if(
timebar
)
gui->timebar->update(1);
double zoom = !mwindow->edl->session->cwindow_scrollbars ?
gui->timebar->update(1);
double zoom = !mwindow->edl->session->cwindow_scrollbars ?