将最后可信帧跳转移到参数动作结束后并覆盖宿主拒绝回归
这个提交包含在:
1 父节点
9b097e04a2
当前提交
19db05b364
10 个文件已更改
+106
-30
没有与搜索条件相匹配的文件
@@ -173,11 +173,14 @@
|
||||
if(CMTIME_IS_NUMERIC(last))[[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)]timelineTime:&timeline fromInputTime:last];
|
||||
id commands=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];
|
||||
if(!commands)commands=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI)];
|
||||
NSError *error=nil;
|
||||
BOOL supported=[commands respondsToSelector:@selector(movePlayheadToTime:error:)];
|
||||
BOOL moved=CMTIME_IS_NUMERIC(timeline)&&supported&&[commands movePlayheadToTime:timeline error:&error];
|
||||
os_log(OS_LOG_DEFAULT,"dayu_clone_return input=%{public}.6f timeline=%{public}.6f supported=%{public}d moved=%{public}d error=%{public}@",CMTimeGetSeconds(last),CMTimeGetSeconds(timeline),supported,moved,error.localizedDescription?:@"");
|
||||
if(!moved)[self toolStatus:[NSString stringWithFormat:@"最后可信位置 %.3fs · %@",CMTimeGetSeconds(last),error.localizedDescription?:@"宿主暂时无法跳转,请手动定位。"]];return;
|
||||
// Finish the parameter read before asking the host to leave this frame.
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
NSError *error=nil;
|
||||
BOOL supported=[commands respondsToSelector:@selector(movePlayheadToTime:error:)];
|
||||
BOOL moved=CMTIME_IS_NUMERIC(timeline)&&supported&&[commands movePlayheadToTime:timeline error:&error];
|
||||
os_log(OS_LOG_DEFAULT,"dayu_clone_return input=%{public}.6f timeline=%{public}.6f supported=%{public}d moved=%{public}d error=%{public}@",CMTimeGetSeconds(last),CMTimeGetSeconds(timeline),supported,moved,error.localizedDescription?:@"");
|
||||
if(!moved)[self toolStatus:[NSString stringWithFormat:@"最后可信位置 %.3fs · %@",CMTimeGetSeconds(last),error.localizedDescription?:@"宿主暂时无法跳转,请手动定位。"]];
|
||||
});return;
|
||||
}
|
||||
BOOL cancelReference=[command isEqual:@"reference"]&&self->_toolDrawingStampReference;
|
||||
[self discardToolCanvasDraft];
|
||||
|
||||
@@ -218,8 +218,10 @@
|
||||
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"document":DYReadTools(base,kCMTimeZero).document}];
|
||||
int beforeReturn=host->_seekCount;
|
||||
host->_rejectSeekDuringAction=YES;
|
||||
[plugin cloneStampCommand:@"return" mask:stampID atTime:timeAt(2)];drain();
|
||||
run.record(@"clone-last-trusted-button-maps-input-time-to-host-timeline",host->_seekCount==beforeReturn+1&&CMTimeCompare(host->_time,timeAt(2))==0);
|
||||
host->_rejectSeekDuringAction=NO;
|
||||
|
||||
stamp[@"stampTrackMode"]=@"linked";DYWriteTools(base,stampDoc,kCMTimeZero);paired=requestStamp(0);
|
||||
for(int i=0;i<6&&paired;i++){pairedFrame(i,true);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}finish();
|
||||
|
||||
@@ -3,15 +3,16 @@
|
||||
@interface DYToolTrackingProbe : NSObject<PROAPIAccessing> {
|
||||
@public
|
||||
id _base;CMTime _time,_timelineOffset,_seekTime;int _seekCount;FxAnalysisState _state;int _forwardStarts,_backwardStarts;
|
||||
int _actionDepth;BOOL _rejectSeekDuringAction;
|
||||
}
|
||||
@end
|
||||
@implementation DYToolTrackingProbe
|
||||
- (id)apiForProtocol:(Protocol*)protocol{NSString *name=NSStringFromProtocol(protocol);if([@[@"FxAnalysisAPI",@"FxTimingAPI_v4",@"FxCustomParameterActionAPI_v4",@"FxCommandAPI_v2"]containsObject:name])return self;return [_base apiForProtocol:protocol];}
|
||||
- (void)startAction:(id)sender{[(id<FxCustomParameterActionAPI_v4>)_base startAction:sender];}
|
||||
- (void)endAction:(id)sender{[(id<FxCustomParameterActionAPI_v4>)_base endAction:sender];}
|
||||
- (void)startAction:(id)sender{++_actionDepth;[(id<FxCustomParameterActionAPI_v4>)_base startAction:sender];}
|
||||
- (void)endAction:(id)sender{[(id<FxCustomParameterActionAPI_v4>)_base endAction:sender];--_actionDepth;}
|
||||
- (CMTime)currentTime{return _time;}
|
||||
- (void)timelineTime:(CMTime*)timeline fromInputTime:(CMTime)input{*timeline=CMTimeAdd(input,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);}
|
||||
- (BOOL)movePlayheadToTime:(CMTime)time error:(NSError**)error{_seekTime=time;_seekCount++;_time=CMTimeSubtract(time,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);return YES;}
|
||||
- (BOOL)movePlayheadToTime:(CMTime)time error:(NSError**)error{if(_rejectSeekDuringAction&&_actionDepth)return NO;_seekTime=time;_seekCount++;_time=CMTimeSubtract(time,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);return YES;}
|
||||
- (FxAnalysisState)analysisStateForEffect{return _state;}
|
||||
- (BOOL)startForwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_forwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;}
|
||||
- (BOOL)startBackwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_backwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;}
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>136</string>
|
||||
<string>137</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>136</string>
|
||||
<string>137</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户