Merge pull request #168 from TakayukiHoshi1984/modify_record_api

MediaStreamRecordingのRecord APIの仕様変更

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostMediaStreamRecordingProfile.m

@@ -744,6 +744,9 @@ - (instancetype)init
                                    [recorder.session startRunning];
                                }
                                isSync = NO;
+                               [weakSelf sendOnRecordingChangeEventWithStatus:DConnectMediaStreamRecordingProfileRecordingStateRecording
+                                                                         path:nil mimeType:recorder.mimeType
+                                                                 errorMessage:nil];
                            }];
 
                           return isSync;
@@ -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) {

dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaDevicePlugin.m

@@ -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;

dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaManager.h

@@ -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の共有インスタンスを返す。
@@ -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のイベントを解除する。