X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fkeyframepopup.C;h=7457773a08f51a7c4c38ba79ced81bf969a532bf;hp=7624da1631574fc7a8d16471c9a4f70110ec8f5c;hb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/keyframepopup.C b/cinelerra-5.1/cinelerra/keyframepopup.C index 7624da16..7457773a 100644 --- a/cinelerra-5.1/cinelerra/keyframepopup.C +++ b/cinelerra-5.1/cinelerra/keyframepopup.C @@ -128,7 +128,7 @@ int KeyframePopup::update(Automation *automation, Autos *autos, Auto *auto_keyfr mwindow->edl->local_session->set_selectionstart(new_position); mwindow->edl->local_session->set_selectionend(new_position); mwindow->gui->lock_window(); - mwindow->gui->update(1, 1, 1, 1, 1, 1, 0); + mwindow->gui->update(1, NORMAL_DRAW, 1, 1, 1, 1, 0); mwindow->gui->unlock_window(); } return 0; @@ -196,7 +196,7 @@ int KeyframePopupDelete::handle_event() mwindow->undo->update_undo_after(_("delete keyframe"), LOAD_ALL); mwindow->save_backup(); - mwindow->gui->update(0, 1, // 1 for incremental drawing. 2 for full refresh + mwindow->gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0); mwindow->update_plugin_guis(); mwindow->restart_brender(); @@ -484,7 +484,7 @@ int KeyframePopupCurveMode::handle_event() mwindow->undo->update_undo_after(_("change keyframe curve mode"), LOAD_ALL); mwindow->save_backup(); - mwindow->gui->update(0, 1, 0,0,0,0,0); // incremental redraw for canvas + mwindow->gui->update(0, NORMAL_DRAW, 0,0,0,0,0); // incremental redraw for canvas mwindow->cwindow->update(0,0, 1, 0,0); // redraw tool window in compositor mwindow->update_plugin_guis(); mwindow->restart_brender(); @@ -623,22 +623,7 @@ void KeySpeedPatch::create_objects() add_subwindow(key_speed_ok = new KeySpeedOK(this, x, y, lok_images)); activate(); show_window(); -} - -int KeySpeedPatch::cursor_enter_event() -{ - if( is_event_win() ) - mwindow->speed_before(); - return 1; -} - -int KeySpeedPatch::cursor_leave_event() -{ - if( is_event_win() ) { - mwindow->speed_after(1); - mwindow->resync_guis(); - } - return 1; + mwindow->speed_before(); } void KeySpeedPatch::update(float v) @@ -660,9 +645,9 @@ void KeySpeedPatch::update_speed(float v) FloatAuto *current = (FloatAuto*)speed_autos->get_auto_for_editing(position); float change = v - current->get_value(); current->set_value(v); - if( track->gang && track->record ) { + if( track->is_ganged() && track->is_armed() ) { TrackCanvas *track_canvas = patch->patchbay->pane->canvas; - track_canvas->fill_ganged_autos(1, change, track, current); + track_canvas->fill_ganged_autos(-1, change, track, current); track_canvas->update_ganged_autos(0, track, current); track_canvas->clear_ganged_autos(); }