projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b25542
)
viewer window playback tweaks
author
Good Guy
<good1.2guy@gmail.com>
Tue, 30 Jan 2018 00:25:02 +0000
(17:25 -0700)
committer
Good Guy
<good1.2guy@gmail.com>
Tue, 30 Jan 2018 00:25:02 +0000
(17:25 -0700)
cinelerra-5.1/cinelerra/vwindowgui.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index a94e176750392f3efdf8b29849b546095eaa4536..ea05537bb7b2ec6e67bdfe08dfd21a685c13f100 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-354,6
+354,19
@@
int VWindowGUI::keypress_event()
int VWindowGUI::button_press_event()
{
int VWindowGUI::button_press_event()
{
+ if( get_buttonpress() == LEFT_BUTTON && canvas->get_canvas() &&
+ canvas->get_canvas()->get_cursor_over_window() ) {
+ PlaybackEngine *playback_engine = vwindow->playback_engine;
+ unlock_window();
+ if( playback_engine->is_playing_back ) {
+ transport->handle_transport(STOP, 1);
+ }
+ else {
+ transport->handle_transport(NORMAL_FWD, 1);
+ }
+ vwindow->gui->lock_window("VWindowEditing::prev_label");
+ return 1;
+ }
if(canvas->get_canvas())
return canvas->button_press_event_base(canvas->get_canvas());
return 0;
if(canvas->get_canvas())
return canvas->button_press_event_base(canvas->get_canvas());
return 0;
@@
-418,6
+431,11
@@
int VWindowGUI::drag_stop()
EDL *edl = mwindow->session->drag_clips->size() ?
mwindow->session->drag_clips->get(0) :
0;
EDL *edl = mwindow->session->drag_clips->size() ?
mwindow->session->drag_clips->get(0) :
0;
+ if( vwindow->playback_engine->is_playing_back ) {
+ unlock_window();
+ vwindow->stop_playback(1);
+ lock_window("VWindowGUI::drag_stop");
+ }
if(indexable)
vwindow->change_source(indexable);
if(indexable)
vwindow->change_source(indexable);