fix drop silence on track segv, dont deselect on drop, set expanders if plugins dropped

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

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 3707a1eb1d3921a82c644ae1e763d15b86835b6c..3d152c71bfa5eb6bc272a7eabfd878699f3bb6ed 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -194,7 +194,7 @@ int TrackCanvas::drag_motion(
                drag_cursor_motion(cursor_x, cursor_y,
                        over_track, over_edit, over_pluginset, over_plugin);
        }
-        if( over_track && !*over_track )
+       if( over_track && !*over_track )
                *over_track = pane->over_patchbay();
        return 0;
 }
@@ -278,6 +278,7 @@ int TrackCanvas::drag_stop_event()
 {
        int result = gui->drag_stop();
        if( !result && mwindow->session->current_operation ) {
+               mwindow->edl->tracks->clear_selected_edits();
                mwindow->session->current_operation = NO_OPERATION;
                drag_scroll = 0;
        }
@@ -523,10 +524,9 @@ int TrackCanvas::drag_stop(int *redraw)
                                                ret = test_track_group(drag_group, drop_track, new_pos);
                                        }
                                        if( ret )
-                                               mwindow->move_group(drag_group, drop_track, new_pos, 1);
+                                               mwindow->move_group(drag_group, drop_track, new_pos);
                                        drag_group->remove_user();
                                        mwindow->session->drag_group = 0;
-                                       mwindow->edl->tracks->clear_selected_edits();
                                }
                        }
                        result = 1;
@@ -2284,7 +2284,7 @@ void TrackCanvas::draw_keyframe_reticle()
                mwindow->session->drag_auto->autos->autoidx : -1;
 
        if( get_buttonpress() == LEFT_BUTTON && dragging &&
-            keyframe_hairline == HAIRLINE_DRAGGING ) {
+           keyframe_hairline == HAIRLINE_DRAGGING ) {
                draw_hairline(mwindow->session->drag_auto, RED, 1);
                return;
        }
@@ -3571,6 +3571,9 @@ int TrackCanvas::draw_hairline(Auto *auto_keyframe, int color, int show)
 
        calculate_viewport(track, view_start, unit_start, view_end, unit_end,
                        yscale, center_pixel, zoom_sample, zoom_units);
+       if( auto_keyframe->position < unit_start ||
+           auto_keyframe->position >= unit_end )
+               return 0;
 
        double ax = 0, ay = 0;
        calculate_auto_position(&ax, &ay, 0, 0, 0, 0,
@@ -4878,14 +4881,30 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 // Where the drag started, so we know relative position inside the edit later
                                        mwindow->session->drag_position =
                                                mwindow->edl->get_cursor_position(cursor_x, pane->number);
-                                       if( ctrl_down() ) {
-                                               mwindow->session->current_operation = DRAG_EDIT;
+                                       drag_start = 0; // if unselected "fast" drag
+                                       if( !ctrl_down() && !edit->silence() && !edit->is_selected ) {
+                                               mwindow->edl->tracks->clear_selected_edits();
+                                               mwindow->edl->tracks->select_affected_edits(
+                                                       edit->track->from_units(edit->startproject),
+                                                       edit->track, 1);
+                                               drag_start = 1;
+                                       }
 // Construct list of all affected edits
+                                       if( ctrl_down() || drag_start ) {
                                                mwindow->edl->tracks->get_selected_edits(mwindow->session->drag_edits);
+                                               if( mwindow->session->drag_edits->size() > 0 ) {
+                                                       mwindow->session->current_operation = DRAG_EDIT;
 // Need to create drag window
-                                               int cx, cy;  get_abs_cursor(cx, cy);
-                                               gui->drag_popup = new BC_DragWindow(gui,
-                                                       mwindow->theme->get_image("clip_icon"), cx, cy);
+                                                       int cx, cy;  get_abs_cursor(cx, cy);
+                                                       gui->drag_popup = new BC_DragWindow(gui,
+                                                               mwindow->theme->get_image("clip_icon"), cx, cy);
+                                                       result = 1;
+                                               }
+                                               else {
+                                                       rerender = start_selection(mwindow->session->drag_position);
+                                                       mwindow->session->current_operation = SELECT_REGION;
+                                                       update_cursor = 1;
+                                               }
                                        }
                                        else if( edit->is_selected ) {
                                                if( mwindow->session->drag_group )
@@ -4893,15 +4912,18 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
                                                double start_position = 0;
                                                mwindow->session->drag_group =
                                                        mwindow->selected_edits_to_clip(0, &start_position,
-                                                               &mwindow->session->drag_group_first_track);
+                                                               &mwindow->session->drag_group_first_track,
+                                                               mwindow->edl->session->labels_follow_edits,
+                                                               mwindow->edl->session->autos_follow_edits,
+                                                               mwindow->edl->session->plugins_follow_edits);
                                                if( mwindow->session->drag_group ) {
                                                        mwindow->session->current_operation = DRAG_GROUP;
                                                        mwindow->session->drag_group_position = start_position;
                                                        mwindow->session->drag_group_edit = edit;
                                                        mwindow->session->drag_origin_y = edit_y;
+                                                       result = 1;
                                                }
                                        }
-                                       result = 1;
                                }
                        }
                }
@@ -5018,11 +5040,11 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
                }
                else
 // Move plugin
-               if(drag_start && plugin->track->record) {
-                       if(mwindow->edl->session->editing_mode == EDITING_ARROW) {
-                               if(plugin->track->data_type == TRACK_AUDIO)
+               if( drag_start && plugin->track->record && !plugin->silence() ) {
+                       if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
+                               if( plugin->track->data_type == TRACK_AUDIO )
                                        mwindow->session->current_operation = DRAG_AEFFECT_COPY;
-                               else if(plugin->track->data_type == TRACK_VIDEO)
+                               else if( plugin->track->data_type == TRACK_VIDEO )
                                        mwindow->session->current_operation = DRAG_VEFFECT_COPY;
 
                                mwindow->session->drag_plugin = plugin;
@@ -5343,7 +5365,7 @@ void TrackCanvas::show_message(Auto *current, int show_curve_type, const char *f
        va_list ap;
        va_start(ap, fmt);
        vsnprintf(cp, ep-cp, fmt, ap);
-        va_end(ap);
+       va_end(ap);
        gui->show_message(string);
 }