update shuttlerc, fix vwdw lock update_position
authorGood Guy <good1.2guy@gmail.com>
Fri, 15 Feb 2019 04:17:19 +0000 (21:17 -0700)
committerGood Guy <good1.2guy@gmail.com>
Fri, 15 Feb 2019 04:17:19 +0000 (21:17 -0700)
cinelerra-5.1/cinelerra/awindowgui.C
cinelerra-5.1/shuttlerc

index a36c419..65e5ba2 100644 (file)
@@ -399,7 +399,9 @@ int AssetViewPopup::button_press_event()
                vedl->set_outpoint(end);
                vedl->local_session->set_selectionstart(start);
                vedl->local_session->set_selectionend(end);
+               vwindow->gui->lock_window("AssetViewPopup::button_press_event");
                vwindow->update_position();
+               vwindow->gui->unlock_window();
                return 1;
        }
        else {
index 2bb7bfd..0c9affb 100644 (file)
@@ -29,7 +29,7 @@
  K10 Alt-XK_Left  # Go to previous edit
  K11 Alt-XK_Right # Go to next edit
  K12 Ctrl-XK_Left  # Go to previous label
- K13 Ctrl-XK_Right # Go to next label 
+ K13 Ctrl-XK_Right # Go to next label
  K14 "["        # Toggle in
  K15 "]"        # Toggle out
 
  K10 Alt-XK_Left  # Go to previous edit
  K11 Alt-XK_Right # Go to next edit
  K12 Ctrl-XK_Left  # Go to previous label
- K13 Ctrl-XK_Right # Go to next label 
+ K13 Ctrl-XK_Right # Go to next label
  K14 "["        # Toggle in
  K15 "]"        # Toggle out
+
  K1 "i"                # Clip
  K2 "x"                # Cut
  K3 "c"                # Copy
 
  K10 "["       # Toggle in if no K14
  K11 "]"       # Toggle in if no K15
- K12 Alt-XK_Left  # Go to previous edit
- K13 Alt-XK_Right # Go to next edit
+ K12 Ctrl-XK_Left  # Go to previous label
+ K13 Ctrl-XK_Right # Go to next label
  K14 "["        # Toggle in
  K15 "]"        # Toggle out
+
  K1 "i"                # Clip
  K2 "v"                # Splice
  K3 "c"                # Copy