Skip to content

MediaStreamRecordingのRecord APIの仕様変更 #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakayukiHoshi1984 merged 6 commits into from
Nov 9, 2017
Merged

MediaStreamRecordingのRecord APIの仕様変更 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ffe288
Merge pull request #277 from TakayukiHoshi1984/modify_irkit_info_plist
masaru-takano Oct 18, 2017
74f0877
MediaStreamRecordingのRecordAPIの仕様変更
TakayukiHoshi1984 Oct 31, 2017
de6a64c
ThetaプラグインにonRecordingChangeを追加。
TakayukiHoshi1984 Nov 2, 2017
8c16446
FileAPIの調整。
TakayukiHoshi1984 Nov 2, 2017
1748e3a
ROIの修正。
TakayukiHoshi1984 Nov 2, 2017
58714b4
Thetaのサービスの状態更新タイミングの調整。
TakayukiHoshi1984 Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...DeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostMediaStreamRecordingProfile.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,9 @@ - (instancetype)init
[recorder.session startRunning];
}
isSync = NO;
[weakSelf sendOnRecordingChangeEventWithStatus:DConnectMediaStreamRecordingProfileRecordingStateRecording
path:nil mimeType:recorder.mimeType
errorMessage:nil];
}];

return isSync;
Expand Down Expand Up @@ -1554,6 +1557,7 @@ - (void) sendOnRecordingChangeEventWithStatus:(NSString *)status
DConnectMessage *media = [DConnectMessage message];
[DConnectMediaStreamRecordingProfile setStatus:status target:media];
if (path) {
[DConnectMediaStreamRecordingProfile setUri:path target:media];
[DConnectMediaStreamRecordingProfile setPath:path target:media];
}
if (mimeType) {
Expand Down
8 changes: 1 addition & 7 deletions dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaDevicePlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,10 @@ - (id) init
self.pluginName = @"Theta (Device Connect Device Plug-in)";
[[DPThetaManager sharedManager] setServiceProvider: self.serviceProvider];
[[DPThetaManager sharedManager] setPlugin:self];
[[DPThetaManager sharedManager] init];

self.fileMgr = [DConnectFileManager fileManagerForPlugin:self];
[self addProfile:[DPThetaSystemProfile new]];

// イベントマネージャの準備
Class key = [self class];
[[DConnectEventManager sharedManagerForClass:key]
setController:[DConnectDBCacheController
controllerWithClass:key]];

}

return self;
Expand Down
4 changes: 2 additions & 2 deletions dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ typedef void (^DPThetaOnPhotoBlock)(NSString *path);
@param[out] status 動画撮影中のステータス
@param[out] message エラーメッセージがある場合
*/
typedef void (^DPThetaOnStatusChangeCallback)(PtpIpObjectInfo *object, NSString *status, NSString *message);
typedef void (^DPThetaOnStatusChangeCallback)(NSString *status, NSString *message);

/*!
@brief DPSpheroManagerの共有インスタンスを返す。
Expand Down Expand Up @@ -159,7 +159,7 @@ typedef void (^DPThetaOnStatusChangeCallback)(PtpIpObjectInfo *object, NSString
@param[in] callback イベントを送信する
*/
- (void)addOnStatusEventCallbackWithID:(NSString*)serviceId
callback:(void (^)(PtpIpObjectInfo *object, NSString *status, NSString *message))callback;
callback:(void (^)(NSString *status, NSString *message))callback;

/*!
@brief OnPhotoのイベントを解除する。
Expand Down
Loading