projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add refresh_only to scopewindow, fix alsa prefs for capture source, add python to...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.C
b/cinelerra-5.1/cinelerra/cwindowgui.C
index 1aff4d6c172fa10c3c27cf3aedd2dd7c2c83c557..006d6ddc59f148e764d5d55d8af2eb44242fc86b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.C
@@
-1095,14
+1095,19
@@
int CWindowCanvas::do_scroll(EDL *edl, float cursor_x, float cursor_y)
int CWindowCanvas::scope_on()
{
int CWindowCanvas::scope_on()
{
- return !gui->edit_panel->scope_dialog ? 0 :
- gui->edit_panel->scope_dialog->running();
+ EditPanelScopeDialog *scope_dialog = gui->edit_panel->scope_dialog;
+ if( !scope_dialog || !scope_dialog->scope_gui ) return 0;
+ if( scope_dialog->scope_gui->use_refresh ) return 0;
+ return scope_dialog->running();
}
}
-void CWindowCanvas::draw_scope(VFrame *output)
+void CWindowCanvas::draw_scope(VFrame *output
, int refresh
)
{
{
- if( gui->edit_panel->scope_dialog && output )
- gui->edit_panel->scope_dialog->process(output);
+ if( !output ) return;
+ EditPanelScopeDialog *scope_dialog = gui->edit_panel->scope_dialog;
+ if( !scope_dialog || !scope_dialog->scope_gui ) return;
+ if( scope_dialog->scope_gui->use_refresh && !refresh ) return;
+ scope_dialog->process(output);
}
void CWindowCanvas::draw_refresh(int flush)
}
void CWindowCanvas::draw_refresh(int flush)