projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index 8a3e5888602f2fc0787d511bb7fee09b9de9a981..1217633f0cdb4fd9a0896c15a97e07a1292094ed 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-558,7
+558,8
@@
VWindowEditing::VWindowEditing(MWindow *mwindow, VWindow *vwindow)
0, // use_commerical
0, // use_goto
1, // use_clk2play
0, // use_commerical
0, // use_goto
1, // use_clk2play
- 1) // use_scope
+ 1, // use_scope
+ 0) // use_gang_tracks
{
this->mwindow = mwindow;
this->vwindow = vwindow;
{
this->mwindow = mwindow;
this->vwindow = vwindow;
@@
-703,6
+704,7
@@
void VWindowEditing::panel_set_editing_mode(int mode) {}
void VWindowEditing::panel_set_auto_keyframes(int v) {}
void VWindowEditing::panel_set_span_keyframes(int v) {}
void VWindowEditing::panel_set_labels_follow_edits(int v) {}
void VWindowEditing::panel_set_auto_keyframes(int v) {}
void VWindowEditing::panel_set_span_keyframes(int v) {}
void VWindowEditing::panel_set_labels_follow_edits(int v) {}
+void VWindowEditing::panel_set_gang_tracks(int v) {}
VWindowSource::VWindowSource(MWindow *mwindow, VWindowGUI *vwindow, int x, int y)
VWindowSource::VWindowSource(MWindow *mwindow, VWindowGUI *vwindow, int x, int y)
@@
-832,6
+834,7
@@
int VWindowCanvas::scope_on()
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;
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;
+ if( scope_dialog->scope_gui->use_release ) return 0;
return scope_dialog->running();
}
return scope_dialog->running();
}
@@
-841,9
+844,18
@@
void VWindowCanvas::draw_scope(VFrame *output, int refresh)
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;
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;
+ if( scope_dialog->scope_gui->use_release && refresh >= 0 ) return;
scope_dialog->process(output);
}
scope_dialog->process(output);
}
+int VWindowCanvas::button_release_event()
+{
+ BC_WindowBase *window = get_canvas();
+ if( window && !window->get_video_on() )
+ draw_scope(refresh_frame, -1);
+ return Canvas::button_release_event();
+}
+
void VWindowCanvas::draw_refresh(int flush)
{
if( !get_canvas()->get_video_on() ) {
void VWindowCanvas::draw_refresh(int flush)
{
if( !get_canvas()->get_video_on() ) {