drag edithandle rework, lib x264/x265 update, dvb fixes, batchrender boot_defaults...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / labels.C

diff --git a/cinelerra-5.1/cinelerra/labels.C b/cinelerra-5.1/cinelerra/labels.C
index 933985e5297dd984b99c38de10da3515e360808a..1435a985c8d88abc115a12d245387c1ec55f29cc 100644 (file)
--- a/cinelerra-5.1/cinelerra/labels.C
+++ b/cinelerra-5.1/cinelerra/labels.C
@@ -478,36 +478,21 @@ int Labels::paste_silence(double start, double end)
        return 0;
 }
 
-int Labels::modify_handles(double oldposition,
-       double newposition,
-       int currentend,
-       int handle_mode,
-       int edit_labels)
+int Labels::modify_handles(double oldposition, double newposition,
+               int currentend, int handle_mode, int edit_labels)
 {
-       if(edit_labels &&
-               handle_mode == MOVE_ALL_EDITS)
-       {
-               if(currentend == 0)          // left handle
-               {
-                       if(newposition < oldposition)
-                       {
+       if( edit_labels && handle_mode == MOVE_EDGE ) {
+               if( !currentend ) {     // left handle
+                       if( newposition < oldposition )
                                insert(oldposition, oldposition - newposition);    // shift all labels right
-                       }
                        else
-                       {
                                clear(oldposition, newposition);   // clear selection
-                       }
                }
-               else
-               {                            // right handle
-                       if(newposition < oldposition)
-                       {
+               else {                  // right handle
+                       if( newposition < oldposition )
                                clear(newposition, oldposition);
-                       }
                        else
-                       {
                                insert(oldposition, newposition - oldposition);
-                       }
                }
        }
        return 0;