X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fpatchgui.C;h=3a20d44c32db3e1636475ff578c175e2ee176aab;hb=4784a8d70bc39f9b7e467f93304d2df3f23fd2df;hp=1e31919b3b9699756d01aec7216b920f0d4a47df;hpb=49b1cbd236ac6c593d4fc85ed3f4a6344cbb9279;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/patchgui.C b/cinelerra-5.1/cinelerra/patchgui.C index 1e31919b..3a20d44c 100644 --- a/cinelerra-5.1/cinelerra/patchgui.C +++ b/cinelerra-5.1/cinelerra/patchgui.C @@ -199,7 +199,7 @@ int PatchGUI::update(int x, int y) record->update(track->record); gang->update(track->gang); draw->update(track->draw); - mute->update(mute->get_keyframe(mwindow, this)->value); + mute->update(mwindow->get_int_auto(this, AUTOMATION_MUTE)->value); expand->update(track->expand_view); } } @@ -555,7 +555,7 @@ int DrawPatch::button_release_event() MutePatch::MutePatch(MWindow *mwindow, PatchGUI *patch, int x, int y) : BC_Toggle(x, y, mwindow->theme->get_image_set("mutepatch_data"), - get_keyframe(mwindow, patch)->value, + mwindow->get_int_auto(patch, AUTOMATION_MUTE)->value, "", 0, 0, @@ -609,27 +609,6 @@ int MutePatch::button_release_event() return result; } -IntAuto* MutePatch::get_keyframe(MWindow *mwindow, PatchGUI *patch) -{ - Auto *current = 0; - double unit_position = mwindow->edl->local_session->get_selectionstart(1); - unit_position = mwindow->edl->align_to_frame(unit_position, 0); - unit_position = patch->track->to_units(unit_position, 0); - return (IntAuto*)patch->track->automation->autos[AUTOMATION_MUTE]->get_prev_auto( - (int64_t)unit_position, - PLAY_FORWARD, - current); -} - - - - - - - - - - ExpandPatch::ExpandPatch(MWindow *mwindow, PatchGUI *patch, int x, int y) @@ -734,13 +713,13 @@ int NudgePatch::handle_event() void NudgePatch::set_value(int64_t value) { - mwindow->undo->update_undo_before(_("nudge"), this); + mwindow->undo->update_undo_before(_("nudge."), this); patch->track->nudge = value; if(patch->track->gang && patch->track->record) patch->patchbay->synchronize_nudge(patch->track->nudge, patch->track); - mwindow->undo->update_undo_after(_("nudge"), LOAD_PATCHES); + mwindow->undo->update_undo_after(_("nudge."), LOAD_PATCHES); mwindow->gui->unlock_window(); if(patch->track->data_type == TRACK_VIDEO)