X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=b2510711fa2c4361a120e526a4473e8fc7f10d9a;hp=fdd3112bb6b2fb62f315fc7c2f3fb70de94bf9ba;hb=8a2d79c16c6793d7d3483e9a74205569228ca0cc;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;ds=sidebyside diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C index fdd3112b..b2510711 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.C +++ b/cinelerra-5.1/cinelerra/trackcanvas.C @@ -1193,7 +1193,6 @@ void TrackCanvas::draw_paste_destination() from_units(drop_edit_position(&insertion, mwindow->session->drag_edit, mwindow->session->drag_edit->length)); - current_vedit++; } } if( paste_position >= 0 ) { @@ -2092,6 +2091,12 @@ int TrackCanvas::do_keyframes(int cursor_x, // auto_operations[i]); if(buttonpress) { + if (buttonpress == 2 && auto_keyframe ) + { + double position = track->from_units(auto_keyframe->position); + mwindow->edl->local_session->set_selectionstart(position); + mwindow->edl->local_session->set_selectionend(position); + } if (buttonpress != 3) { if(i == AUTOMATION_FADE || i == AUTOMATION_SPEED) @@ -2744,7 +2749,7 @@ void TrackCanvas::fill_ganged_autos(int all, float change, Track *skip, FloatAut CLAMP(new_value, auto_min, auto_max); keyframe->adjust_to_new_coordinates(current_position, new_value); } - else if( mwindow->edl->session->auto_keyframes ) { + else { // create keyframe on neighbouring track at the point in time given by fauto FloatAuto *previous = 0, *next = 0; float value = fade_autos->get_value(current_position, PLAY_FORWARD, previous, next); @@ -2753,8 +2758,6 @@ void TrackCanvas::fill_ganged_autos(int all, float change, Track *skip, FloatAut keyframe = (FloatAuto*)fade_autos->insert_auto(current_position); keyframe->set_value(new_value); } - else - continue; mwindow->session->drag_auto_gang->append((Auto *)keyframe); } }