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;
}
{
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;
}
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;
int rerender = 0;
int new_cursor, update_cursor;
- if( mwindow->session->current_operation == DRAG_BUTTON_DOWN )
+ if( mwindow->session->current_operation == GROUP_TOGGLE )
mwindow->session->current_operation = NO_OPERATION;
else if( mwindow->session->current_operation != NO_OPERATION )
return 0;
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;
}
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,
result = 1;
break; }
- case DRAG_BUTTON_DOWN: {
+ case GROUP_TOGGLE: {
Edit *edit = mwindow->session->drag_edit;
if( edit ) {
if( shift_down() && edit->is_selected ) {
redraw = 0;
}
else {
- if( edit->group_id )
- mwindow->edl->tracks->set_group_selected(edit->group_id, -1);
- else
- edit->is_selected = !edit->is_selected ? 1 : 0;
+ if( mwindow->preferences->ctrl_toggle && !ctrl_down() )
+ mwindow->edl->tracks->clear_selected_edits();
+ edit->set_selected(-1);
}
}
mwindow->session->current_operation = NO_OPERATION;
if(cursor_x >= edit_x && cursor_x < edit_x + edit_w &&
cursor_y >= edit_y && cursor_y < edit_y + edit_h) {
if( button_press && get_buttonpress() == LEFT_BUTTON ) {
- if( mwindow->edl->session->editing_mode == EDITING_IBEAM &&
- get_double_click() ) {
-// Select duration of edit
+ if( get_double_click() ) {
+ mwindow->edl->tracks->clear_selected_edits();
double start = edit->track->from_units(edit->startproject);
start = mwindow->edl->align_to_frame(start, 0);
mwindow->edl->local_session->set_selectionstart(start);
- double end = edit->track->from_units(edit->startproject+edit->length);
- end = mwindow->edl->align_to_frame(end, 0);
- mwindow->edl->local_session->set_selectionend(end);
- mwindow->edl->tracks->clear_selected_edits();
- mwindow->edl->tracks->select_affected_edits(
- edit->track->from_units(edit->startproject),
- edit->track, 1);
+ if( ctrl_down() ) {
+// Select duration of edit
+ double end = edit->track->from_units(edit->startproject+edit->length);
+ end = mwindow->edl->align_to_frame(end, 0);
+ mwindow->edl->local_session->set_selectionend(end);
+ mwindow->edl->tracks->select_affected_edits(
+ edit->track->from_units(edit->startproject),
+ edit->track, 1);
+ }
+ else {
+ mwindow->edl->local_session->set_selectionend(start);
+ edit->set_selected(1);
+ }
result = 1;
}
- else if( mwindow->edl->session->editing_mode == EDITING_ARROW ||
- (mwindow->edl->session->editing_mode == EDITING_IBEAM &&
- ctrl_down()) ) {
+ else if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
mwindow->session->drag_edit = edit;
- mwindow->session->current_operation = DRAG_BUTTON_DOWN;
+ mwindow->session->current_operation = GROUP_TOGGLE;
result = 1;
}
if( result ) {
}
}
else if( drag_start && track->record ) {
- if( mwindow->edl->session->editing_mode == EDITING_ARROW ||
- ( mwindow->edl->session->editing_mode == EDITING_IBEAM &&
- ctrl_down() ) ) {
-// Need to create drag window
- mwindow->session->drag_edit = edit;
- mwindow->session->drag_origin_x = cursor_x;
- mwindow->session->drag_origin_y = cursor_y;
- // 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);
+ mwindow->session->drag_edit = edit;
+ mwindow->session->drag_origin_x = cursor_x;
+ mwindow->session->drag_origin_y = cursor_y;
+// 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);
+ 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() ) {
+ 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;
- mwindow->edl->tracks->get_selected_edits(mwindow->session->drag_edits);
+// 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);
-
+ result = 1;
}
- else if( edit->is_selected ) {
- if( mwindow->session->drag_group )
- mwindow->session->drag_group->remove_user();
- double start_position = 0;
- mwindow->session->drag_group =
- mwindow->selected_edits_to_clip(0, &start_position,
- &mwindow->session->drag_group_first_track);
- 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;
- }
+ 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 )
+ mwindow->session->drag_group->remove_user();
+ double start_position = 0;
+ mwindow->session->drag_group =
+ mwindow->selected_edits_to_clip(0, &start_position,
+ &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;
}
}
}
}
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;
va_list ap;
va_start(ap, fmt);
vsnprintf(cp, ep-cp, fmt, ap);
- va_end(ap);
+ va_end(ap);
gui->show_message(string);
}
projects / goodguy / cinelerra.git / blobdiff