double track_position = track->from_units(drop_position);
track_position = mwindow->edl->align_to_frame(track_position, 0);
mwindow->move_edits(mwindow->session->drag_edits,
- track, track_position, !insertion);
+ track, track_position, insertion);
}
result = 1;
void TrackCanvas::draw_drag_handle()
{
- if(mwindow->session->current_operation == DRAG_EDITHANDLE2 ||
- mwindow->session->current_operation == DRAG_PLUGINHANDLE2)
- {
-//printf("TrackCanvas::draw_drag_handle 1 %ld %ld\n", mwindow->session->drag_sample, mwindow->edl->local_session->view_start);
- int64_t pixel1 = Units::round(mwindow->session->drag_position *
- mwindow->edl->session->sample_rate /
- mwindow->edl->local_session->zoom_sample -
- mwindow->edl->local_session->view_start[pane->number]);
-//printf("TrackCanvas::draw_drag_handle 2 %d %jd\n", pane->number, pixel1);
- set_color(!snapped ? GREEN : (snapped=0, YELLOW));
- set_inverse();
-//printf("TrackCanvas::draw_drag_handle 3\n");
- draw_line(pixel1, 0, pixel1, get_h());
- set_opaque();
-//printf("TrackCanvas::draw_drag_handle 4\n");
+ if( mwindow->session->current_operation != DRAG_EDITHANDLE2 &&
+ mwindow->session->current_operation != DRAG_PLUGINHANDLE2 ) return;
+ int64_t pixel1 = Units::round(mwindow->session->drag_position *
+ mwindow->edl->session->sample_rate /
+ mwindow->edl->local_session->zoom_sample -
+ mwindow->edl->local_session->view_start[pane->number]);
+ set_color(!snapped ? GREEN : (snapped=0, YELLOW));
+ set_inverse();
+ draw_line(pixel1, 0, pixel1, get_h());
+ set_opaque();
+
+ if( mwindow->session->current_operation != DRAG_EDITHANDLE2 ) return;
+ if( !mwindow->session->drag_edit ) return;
+ int group_id = mwindow->session->drag_edit->group_id;
+ if( !group_id ) return;
+ int64_t dx, dy, dw, dh;
+ edit_dimensions(mwindow->session->drag_edit, dx, dy, dw, dh);
+ int drag_handle = mwindow->session->drag_handle;
+ int64_t pixel0 = !drag_handle ? dx : dx + dw;
+ int delta = pixel1 - pixel0;
+ set_color(LTPURPLE);
+ set_line_width(3);
+
+ for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
+ Edit *left = 0, *right = 0;
+ double start = DBL_MAX, end = DBL_MIN;
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+ if( edit->group_id != group_id ) continue;
+ double edit_start = edit->track->from_units(edit->startproject);
+ if( edit_start < start ) { start = edit_start; left = edit; }
+ double edit_end = edit->track->from_units(edit->startproject+edit->length);
+ if( edit_end > end ) { end = edit_end; right = edit; }
+ }
+ Edit *edit = !drag_handle ? left : right;
+ if( !edit ) continue;
+ Indexable *idxbl = edit->asset;
+ if( !idxbl ) idxbl = edit->nested_edl;
+ int can_drag = idxbl ? 1 : 0;
+ if( drag_handle ) {
+ int64_t source_len = !idxbl ? -1 :
+ edit->track->data_type == TRACK_AUDIO ?
+ idxbl->get_audio_samples() :
+ edit->track->data_type == TRACK_VIDEO ?
+ idxbl->get_video_frames() : -1;
+ if( edit->startsource + edit->length >= source_len )
+ can_drag = 0;
+ }
+ else if( !edit->startsource )
+ can_drag = 0;
+ int64_t x, y, w, h;
+ edit_dimensions(edit, x, y, w, h);
+ if( y+h < 0 || y >= get_h() ) continue;
+ int edge_x = !drag_handle ? x : x + w;
+ int edge_y = y + h/2, k = 10;
+ if( edge_x >= 0 && edge_x < get_w() ) {
+ if( !can_drag ) {
+ draw_line(edge_x-k,edge_y-k, edge_x+k,edge_y+k);
+ draw_line(edge_x-k,edge_y+k, edge_x+k,edge_y-k);
+ }
+ else if( !drag_handle ) {
+ draw_line(edge_x+k,edge_y-k, edge_x,edge_y);
+ draw_line(edge_x+k,edge_y+k, edge_x,edge_y);
+ }
+ else {
+ draw_line(edge_x,edge_y, edge_x-k,edge_y-k);
+ draw_line(edge_x,edge_y, edge_x-k,edge_y+k);
+ }
+ }
+ edge_x += delta;
+ if( edge_x >= 0 && edge_x < get_w() ) {
+ draw_line(edge_x, y, edge_x, y+h);
+ }
}
+ set_line_width(1);
}
edl->create_objects();
edl->copy_all(mwindow->edl);
MainSession *session = mwindow->session;
- int edit_mode = mwindow->edl->session->edit_handle_mode[session->drag_button];
+ int handle_mode = mwindow->edl->session->edit_handle_mode[session->drag_button];
edl->modify_edithandles(session->drag_start,
- session->drag_position,
- session->drag_handle,
- edit_mode,
+ session->drag_position, session->drag_handle, handle_mode,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
- edl->session->autos_follow_edits);
- double position = edit_mode != MOVE_NO_EDITS &&
- ( session->drag_handle || edit_mode == MOVE_ONE_EDIT ) ?
+ edl->session->autos_follow_edits,
+ !session->drag_edit ? 0 : session->drag_edit->group_id);
+
+ double position = -1;
+ int show_edge = !session->drag_handle ? 1 : 2;
+ switch( handle_mode ) {
+ case MOVE_RIPPLE:
+ case MOVE_EDGE:
+ position = session->drag_handle ?
session->drag_position : session->drag_start;
+ show_edge = 3 - show_edge;
+ break;
+ case MOVE_ROLL:
+ case MOVE_SLIDE:
+ position = session->drag_position;
+ break;
+ case MOVE_SLIP:
+ position = session->drag_start;
+ show_edge = 3 - show_edge;
+ break;
+ }
+
+ if( position < 0 ) position = 0;
Track *track = session->drag_handle_track();
int64_t pos = track->to_units(position, 0);
- render_handle_frame(edl, pos, shift_down() ? 0 :
- session->drag_handle ? 1 : 2);
+ render_handle_frame(edl, pos, shift_down() ? 0 : show_edge);
edl->remove_user();
}
}
CICache *video_cache = new CICache(preferences);
render_engine->set_vcache(video_cache);
render_engine->arm_command(&command);
- int64_t left = pos-1;
- if( left < 0 ) left = 0;
VRender *vrender = render_engine->vrender;
result = vrender &&
!vrender->process_buffer(&vlt, left, 0) &&
Track *track = mwindow->session->drag_handle_track();
double position = track->from_units(mode == 1 ? left : pos);
if( position < 0 ) position = 0;
- edl->local_session->set_selectionstart(position);
- edl->local_session->set_selectionend(position);
PlaybackEngine *playback_engine = mwindow->cwindow->playback_engine;
if( playback_engine->is_playing_back )
playback_engine->stop_playback(1);
+ edl->local_session->set_selectionstart(position);
+ edl->local_session->set_selectionend(position);
mwindow->cwindow->playback_engine->refresh_frame(CHANGE_EDL, edl, 0);
break; }
}
// Snap to nearby values
old_value = current->get_value();
if(shift_down()) {
- double value1, value2, distance1, distance2;
+ double value1, value2, distance1=-1, distance2=-1;
if(current->previous) {
int autogrouptype = current->previous->autos->autogrouptype;
}
}
+ if( result > 0 ) {
+ int group_id = edit_result->group_id;
+ if( group_id > 0 ) {
+ Track *track = edit_result->track;
+ Edit *left = 0, *right = 0;
+ double start = DBL_MAX, end = DBL_MIN;
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+ if( edit->group_id != group_id ) continue;
+ double edit_start = edit->track->from_units(edit->startproject);
+ if( edit_start < start ) { start = edit_start; left = edit; }
+ double edit_end = edit->track->from_units(edit->startproject+edit->length);
+ if( edit_end > end ) { end = edit_end; right = edit; }
+ }
+ Edit *edit = !handle_result ? left : right;
+ if( edit != edit_result )
+ result = 0;
+ }
+ }
+
update_cursor = 1;
if( result > 0 ) {
double position = 0;