+#import "HttpDeviceInfo.h"
+#import "HttpImageInfo.h"
+#import "HttpStorageInfo.h"
+#import "HttpSession.h"
+
+@interface HttpConnection : NSObject
+
+@property (readonly) NSString* sessionId;
+
+- (void)setTargetIp:(NSString* const)server;
+
+- (BOOL)connected;
+
+- (void)connect:(void(^ const)(BOOL connected))block;
+
+- (void)update;
+
+- (void)close:(void(^ const)())block;
+
+- (void)getDeviceInfo:(void(^const )(const HttpDeviceInfo* const info))block;
+
+- (NSArray*)getImageInfoes;
+
+- (NSData*)getThumb:(NSString*)fileId;
+
+- (HttpStorageInfo*)getStorageInfo;
+
+- (NSNumber*)getBatteryLevel;
+
+- (void)setImageFormat:(NSUInteger)width height:(NSUInteger)height;
+
+- (void)startLiveView:(void(^ const)(NSData *frameData))block;
+
+- (void)restartLiveView;
+
+- (HttpImageInfo*)takePicture;
+
+- (BOOL)deleteImage:(HttpImageInfo*)info;
+
+- (NSMutableURLRequest*)createExecuteRequest;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpConnection.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpConnection.m
index c1c0a94..03874cd 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpConnection.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpConnection.m
@@ -1,625 +1,625 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpConnection.h"
-#import "HttpStatusTimer.h"
-#import "HttpFileList.h"
-#import "HttpStream.h"
-
-/**
- * HTTP connection to device
- */
-@interface HttpConnection ()
-{
- NSString *_server;
- NSURLSession *_session;
- NSMutableArray *_infoArray;
- HttpStream *_stream;
-}
-@end
-
-@implementation HttpConnection
-
-#pragma mark - Accessors.
-
-/**
- * Specify address of connection destination
- * @param address Address
- */
-- (void)setTargetIp:(NSString* const)address;
-{
- _server = address;
-}
-
-/**
- * Status of connection to device
- * @return YES:Connect, NO:Disconnect
- */
-- (BOOL)connected
-{
- return (_sessionId != nil);
-}
-
-#pragma mark - Life cycle.
-
-/**
- * Initializer
- * @return Instance
- */
-- (id)init
-{
- if (self = [super init]) {
- // Timeout settings
- NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
- config.timeoutIntervalForRequest = 5.0;
-
- _session = [NSURLSession sessionWithConfiguration:config];
- }
- return self;
-}
-
-#pragma mark - HTTP Connections.
-
-/**
- * Connect to device
- * @param block Block to be called after connection process
- */
-- (void)connect:(void(^ const)(BOOL connected))block
-{
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{
- @"name":@"camera.startSession",
- @"parameters":@""
- };
- NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
-
- // Set the request-body.
- [request setHTTPBody:json];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- _sessionId = [array valueForKeyPath:@"results.sessionId"];
- NSLog(@"result: %@", _sessionId);
- } else {
- _sessionId = nil;
- NSLog(@"error: %@", error);
- }
- block(_sessionId);
- }];
- [task resume];
-}
-
-/**
- * Notify device of continuation of session
- */
-- (void)update
-{
- if (_sessionId) {
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name":@"camera.updateSession",
- @"parameters":
- @{@"sessionId":_sessionId}};
- NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
-
- // Set the request-body.
- [request setHTTPBody:json];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- NSString *newId = nil;
- if (!error) {
- NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- newId = [array valueForKeyPath:@"results.sessionId"];
- NSLog(@"result: %@", newId);
- } else {
- NSLog(@"error: %@", error);
- }
-
- if (newId) {
- _sessionId = newId;
- } else {
- [self connect:^(BOOL connected) {
- _sessionId = connected ? _sessionId : [NSString string];
- }];
- }
- }];
- [task resume];
- }
-}
-
-/**
- * Disconnect from device
- * @param block Block called after disconnection process
- */
-- (void)close:(void(^ const)())block
-{
- if (self->_sessionId) {
- // Stop live view
- [_stream cancel];
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{
- @"name":@"camera.closeSession",
- @"parameters":
- @{ @"sessionId":self->_sessionId }
- };
- NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
-
- // Set the request-body.
- [request setHTTPBody:json];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- block();
- }];
- [task resume];
- self->_sessionId = nil;
- }
-}
-
-/**
- * Acquire device information
- * @param block Block to be called after acquisition process
- */
-- (void)getDeviceInfo:(void(^const )(const HttpDeviceInfo* const info))block
-{
- // Create the url-request.
- NSMutableURLRequest *request = [self createRequest:@"/osc/info" method:@"GET"];
-
- // Do not set body for GET requests
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- HttpDeviceInfo* info = [[HttpDeviceInfo alloc] init];
- if (!error) {
- NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- info.model = [array valueForKeyPath:@"model"];
- info.firmware_version = [array valueForKeyPath:@"firmwareVersion"];
- info.serial_number = [array valueForKeyPath:@"serialNumber"];
- NSLog(@"result: %@", data);
- } else {
- NSLog(@"error: %@", error);
- }
- block(info);
- }];
- [task resume];
-}
-
-/**
- * Acquire list of media files on device
- * @return Media file list
- */
-- (NSArray*)getImageInfoes
-{
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
- HttpFileList *fileList = [[HttpFileList alloc] initWithRequest:request];
-
- NSString* token;
- do {
- token = [fileList getList:10];
- } while ([token length]);
- return fileList.infoArray;
-}
-
-/**
- * Acquire thumbnail image
- * @param fileId File ID
- * @return Thumbnail
- */
-- (NSData*)getThumb:(NSString*)fileId
-{
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.getImage",
- @"parameters":
- @{@"fileUri": fileId, // ID of file to be acquired
- @"_type": @"thumb"}}; // Type of file to be acquired
-
- // Set the request-body.
- [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- __block NSData *output;
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- output = data;
- NSLog(@"result: %@", response);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
- return output;
-}
-
-/**
- * Acquire storage information of device
- * @return Storage information
- */
-- (HttpStorageInfo*)getStorageInfo
-{
- // Set still image as shooting mode (to acquire size set for still images)
- // Continue session
- [self setOptions:@{@"captureMode":@"image"}];
-
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.getOptions",
- @"parameters":
- @{@"sessionId": self->_sessionId,
- @"optionNames":
- @[@"remainingPictures",
- @"remainingSpace",
- @"totalSpace",
- @"fileFormat"]}};
-
- // Set the request-body.
- [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- __block HttpStorageInfo *info = [[HttpStorageInfo alloc] init];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- // Acquire storage information
- NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- NSArray *options = [array valueForKeyPath:@"results.options"];
- info.free_space_in_images = [[options valueForKey:@"remainingPictures"] unsignedLongValue]; // Number of images
- info.free_space_in_bytes = [[options valueForKey:@"remainingSpace"] unsignedLongValue]; //byte
- info.max_capacity = [[options valueForKey:@"totalSpace"] unsignedLongValue]; //byte
-
- // Acquire file format setting
- NSArray *fileFormat = [options valueForKey:@"fileFormat"];
- info.image_width = [[fileFormat valueForKey:@"width"] unsignedLongValue];
- info.image_height = [[fileFormat valueForKey:@"height"] unsignedLongValue];
- NSLog(@"result: %@", info);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
- return info;
-}
-
-/**
- * Acquire battery information of device
- * @return Battery level (4 levels: 0.0, 0.33, 0.67 and 1.0)
- */
--(NSNumber*)getBatteryLevel
-{
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createRequest:@"/osc/state" method:@"POST"];
-
- __block NSNumber *batteryLevel;
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- NSArray* state = [array valueForKey:@"state"];
- batteryLevel = [state valueForKey:@"batteryLevel"];
- NSLog(@"result: %@", batteryLevel);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
- return batteryLevel;
-}
-
-/**
- * Specify shooting size
- * @param width Width of shot image
- * @param height Height of shot image
- */
-- (void)setImageFormat:(NSUInteger)width height:(NSUInteger)height
-{
- [self setOptions:@{@"captureMode": @"image"}];
- [self setOptions:@{@"fileFormat":
- @{@"type": @"jpeg",
- @"width": [NSNumber numberWithUnsignedInteger:width],
- @"height": [NSNumber numberWithUnsignedInteger:height]}}];
-}
-
-/**
- * Start live view
- * @param block Block called on drawing. Used to perform the drawing process of the image.
- */
-- (void)startLiveView:(void(^ const)(NSData *frameData))block
-{
- // Continue session
- [self update];
-
- if ([self connected]) {
- NSMutableURLRequest *request = [self createExecuteRequest];
- _stream = [[HttpStream alloc] initWithRequest:request];
- [_stream setDelegate:block];
- [_stream getData:_sessionId];
- }
-}
-
-/**
- * Resume live view
- */
-- (void)restartLiveView
-{
- if ([self connected]) {
- // Continue session
- [self update];
-
- [_stream getData:_sessionId];
- }
-}
-
-/**
- * Take photo
- * After shooting, the status is checked by the timer and the file information is acquired when the status indicates that the process is complete.
- * @return Information on shot media files
- */
-- (HttpImageInfo*)takePicture
-{
- // Stop live view
- [_stream cancel];
-
- // Set still image as shooting mode
- // Continue session
- [self setOptions:@{@"captureMode":@"image"}];
-
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.takePicture",
- @"parameters":
- @{@"sessionId": self->_sessionId}};
-
- // Set the request-body.
- [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- __block NSString *commandId;
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- commandId = [array valueForKey:@"id"];
- NSLog(@"commandId: %@", commandId);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-
- HttpImageInfo *resultInfo = [self waitCommandComplete:commandId];
-
- // Resume live view
- [_stream getData:_sessionId];
-
- return resultInfo;
-}
-
-/**
- * Check status of specified command and acquire information
- * @param commandId ID of command to be checked
- */
-- (HttpImageInfo*)waitCommandComplete:(NSString*)commandId
-{
- if (commandId != nil) {
- // Create timer and wait until process is completed
- NSMutableURLRequest *requestForStatus = [self createRequest:@"/osc/commands/status" method:@"POST"];
- HttpStatusTimer *timer = [[HttpStatusTimer alloc] initWithRequest:requestForStatus];
- NSString *status = [timer run:commandId];
-
- if ([status isEqualToString:@"done"]) {
- // Create the url-request.
- NSMutableURLRequest *requestForList = [self createExecuteRequest];
- HttpFileList *fileList = [[HttpFileList alloc] initWithRequest:requestForList];
-
- NSString* token;
- do {
- token = [fileList getList:1];
- HttpImageInfo *info = fileList.infoArray.firstObject;
- if ([info.file_id isEqualToString:timer.fileUri]) {
- return info;
- }
- } while ([token length] != 0);
- }
- }
- return nil;
-}
-
-/**
- * Delete specified file
- * @param info Information of file to be deleted
- * @return Delete process successful?
- */
-- (BOOL)deleteImage:(HttpImageInfo*)info
-{
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.delete",
- @"parameters":
- @{@"fileUri": info.file_id}};
-
- // Set the request-body.
- [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- __block NSString *status;
- __block NSString *commandId = nil;
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- status = [array valueForKey:@"state"];
- commandId = [array valueForKey:@"id"];
- NSLog(@"commandId: %@", commandId);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-
- if ([status isEqualToString:@"done"]) {
- return YES;
- } else if (commandId != nil) {
- // Create timer and wait until process is completed
- NSMutableURLRequest *requestForStatus = [self createRequest:@"/osc/commands/status" method:@"POST"];
- HttpStatusTimer *timer = [[HttpStatusTimer alloc] initWithRequest:requestForStatus];
- status = [timer run:commandId];
- if ([status isEqualToString:@"done"]) {
- return YES;
- }
- }
- return NO;
-}
-
-/**
- * Create HTTP request class instance for executing command
- * @return HTTP request class instance for executing command
- */
-- (NSMutableURLRequest*)createExecuteRequest
-{
- // Create the url-request.
- return [self createRequest:@"/osc/commands/execute" method:@"POST"];
-}
-
-#pragma mark - Private methods.
-
-/**
- * Send option setting request
- * @param options Dictionary in which the option name and settings were configured for the key and value
- */
-- (void)setOptions:(NSDictionary*)options
-{
- // Continue session
- [self update];
-
- // Semaphore for synchronization (cannot be entered until signal is called)
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create the url-request.
- NSMutableURLRequest *request = [self createExecuteRequest];
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.setOptions",
- @"parameters":
- @{@"sessionId": self->_sessionId,
- @"options":options}};
-
- // Set the request-body.
- [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [self->_session dataTaskWithRequest:request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSLog(@"result: %@", response);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until signal is called
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-}
-
-/**
- * Create HTTP request
- * @param protocol Path
- * @param method Protocol
- * @return HTTP request instance
- */
-- (NSMutableURLRequest*)createRequest:(NSString* const)protocol method:(NSString* const)method
-{
- NSString *string = [NSString stringWithFormat:@"http://%@%@", self->_server, protocol];
- NSURL *url = [NSURL URLWithString:string];
-
- // Create the url-request.
- NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
-
- // Set the method(HTTP-POST)
- [request setHTTPMethod:method];
-
- [request setValue:@"application/json; charaset=utf-8" forHTTPHeaderField:@"Content-Type"];
-
- return request;
-}
-
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpConnection.h"
+#import "HttpStatusTimer.h"
+#import "HttpFileList.h"
+#import "HttpStream.h"
+
+/**
+ * HTTP connection to device
+ */
+@interface HttpConnection ()
+{
+ NSString *_server;
+ NSURLSession *_session;
+ NSMutableArray *_infoArray;
+ HttpStream *_stream;
+}
+@end
+
+@implementation HttpConnection
+
+#pragma mark - Accessors.
+
+/**
+ * Specify address of connection destination
+ * @param address Address
+ */
+- (void)setTargetIp:(NSString* const)address;
+{
+ _server = address;
+}
+
+/**
+ * Status of connection to device
+ * @return YES:Connect, NO:Disconnect
+ */
+- (BOOL)connected
+{
+ return (_sessionId != nil);
+}
+
+#pragma mark - Life cycle.
+
+/**
+ * Initializer
+ * @return Instance
+ */
+- (id)init
+{
+ if (self = [super init]) {
+ // Timeout settings
+ NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+ config.timeoutIntervalForRequest = 5.0;
+
+ _session = [NSURLSession sessionWithConfiguration:config];
+ }
+ return self;
+}
+
+#pragma mark - HTTP Connections.
+
+/**
+ * Connect to device
+ * @param block Block to be called after connection process
+ */
+- (void)connect:(void(^ const)(BOOL connected))block
+{
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{
+ @"name":@"camera.startSession",
+ @"parameters":@""
+ };
+ NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
+
+ // Set the request-body.
+ [request setHTTPBody:json];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ _sessionId = [array valueForKeyPath:@"results.sessionId"];
+ NSLog(@"result: %@", _sessionId);
+ } else {
+ _sessionId = nil;
+ NSLog(@"error: %@", error);
+ }
+ block(_sessionId);
+ }];
+ [task resume];
+}
+
+/**
+ * Notify device of continuation of session
+ */
+- (void)update
+{
+ if (_sessionId) {
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name":@"camera.updateSession",
+ @"parameters":
+ @{@"sessionId":_sessionId}};
+ NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
+
+ // Set the request-body.
+ [request setHTTPBody:json];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ NSString *newId = nil;
+ if (!error) {
+ NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ newId = [array valueForKeyPath:@"results.sessionId"];
+ NSLog(@"result: %@", newId);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+
+ if (newId) {
+ _sessionId = newId;
+ } else {
+ [self connect:^(BOOL connected) {
+ _sessionId = connected ? _sessionId : [NSString string];
+ }];
+ }
+ }];
+ [task resume];
+ }
+}
+
+/**
+ * Disconnect from device
+ * @param block Block called after disconnection process
+ */
+- (void)close:(void(^ const)())block
+{
+ if (self->_sessionId) {
+ // Stop live view
+ [_stream cancel];
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{
+ @"name":@"camera.closeSession",
+ @"parameters":
+ @{ @"sessionId":self->_sessionId }
+ };
+ NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
+
+ // Set the request-body.
+ [request setHTTPBody:json];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ block();
+ }];
+ [task resume];
+ self->_sessionId = nil;
+ }
+}
+
+/**
+ * Acquire device information
+ * @param block Block to be called after acquisition process
+ */
+- (void)getDeviceInfo:(void(^const )(const HttpDeviceInfo* const info))block
+{
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createRequest:@"/osc/info" method:@"GET"];
+
+ // Do not set body for GET requests
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ HttpDeviceInfo* info = [[HttpDeviceInfo alloc] init];
+ if (!error) {
+ NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ info.model = [array valueForKeyPath:@"model"];
+ info.firmware_version = [array valueForKeyPath:@"firmwareVersion"];
+ info.serial_number = [array valueForKeyPath:@"serialNumber"];
+ NSLog(@"result: %@", data);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ block(info);
+ }];
+ [task resume];
+}
+
+/**
+ * Acquire list of media files on device
+ * @return Media file list
+ */
+- (NSArray*)getImageInfoes
+{
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+ HttpFileList *fileList = [[HttpFileList alloc] initWithRequest:request];
+
+ NSString* token;
+ do {
+ token = [fileList getList:10];
+ } while ([token length]);
+ return fileList.infoArray;
+}
+
+/**
+ * Acquire thumbnail image
+ * @param fileId File ID
+ * @return Thumbnail
+ */
+- (NSData*)getThumb:(NSString*)fileId
+{
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.getImage",
+ @"parameters":
+ @{@"fileUri": fileId, // ID of file to be acquired
+ @"_type": @"thumb"}}; // Type of file to be acquired
+
+ // Set the request-body.
+ [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ __block NSData *output;
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ output = data;
+ NSLog(@"result: %@", response);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ return output;
+}
+
+/**
+ * Acquire storage information of device
+ * @return Storage information
+ */
+- (HttpStorageInfo*)getStorageInfo
+{
+ // Set still image as shooting mode (to acquire size set for still images)
+ // Continue session
+ [self setOptions:@{@"captureMode":@"image"}];
+
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.getOptions",
+ @"parameters":
+ @{@"sessionId": self->_sessionId,
+ @"optionNames":
+ @[@"remainingPictures",
+ @"remainingSpace",
+ @"totalSpace",
+ @"fileFormat"]}};
+
+ // Set the request-body.
+ [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ __block HttpStorageInfo *info = [[HttpStorageInfo alloc] init];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ // Acquire storage information
+ NSArray *array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ NSArray *options = [array valueForKeyPath:@"results.options"];
+ info.free_space_in_images = [[options valueForKey:@"remainingPictures"] unsignedLongValue]; // Number of images
+ info.free_space_in_bytes = [[options valueForKey:@"remainingSpace"] unsignedLongValue]; //byte
+ info.max_capacity = [[options valueForKey:@"totalSpace"] unsignedLongValue]; //byte
+
+ // Acquire file format setting
+ NSArray *fileFormat = [options valueForKey:@"fileFormat"];
+ info.image_width = [[fileFormat valueForKey:@"width"] unsignedLongValue];
+ info.image_height = [[fileFormat valueForKey:@"height"] unsignedLongValue];
+ NSLog(@"result: %@", info);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ return info;
+}
+
+/**
+ * Acquire battery information of device
+ * @return Battery level (4 levels: 0.0, 0.33, 0.67 and 1.0)
+ */
+-(NSNumber*)getBatteryLevel
+{
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createRequest:@"/osc/state" method:@"POST"];
+
+ __block NSNumber *batteryLevel;
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ NSArray* state = [array valueForKey:@"state"];
+ batteryLevel = [state valueForKey:@"batteryLevel"];
+ NSLog(@"result: %@", batteryLevel);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ return batteryLevel;
+}
+
+/**
+ * Specify shooting size
+ * @param width Width of shot image
+ * @param height Height of shot image
+ */
+- (void)setImageFormat:(NSUInteger)width height:(NSUInteger)height
+{
+ [self setOptions:@{@"captureMode": @"image"}];
+ [self setOptions:@{@"fileFormat":
+ @{@"type": @"jpeg",
+ @"width": [NSNumber numberWithUnsignedInteger:width],
+ @"height": [NSNumber numberWithUnsignedInteger:height]}}];
+}
+
+/**
+ * Start live view
+ * @param block Block called on drawing. Used to perform the drawing process of the image.
+ */
+- (void)startLiveView:(void(^ const)(NSData *frameData))block
+{
+ // Continue session
+ [self update];
+
+ if ([self connected]) {
+ NSMutableURLRequest *request = [self createExecuteRequest];
+ _stream = [[HttpStream alloc] initWithRequest:request];
+ [_stream setDelegate:block];
+ [_stream getData:_sessionId];
+ }
+}
+
+/**
+ * Resume live view
+ */
+- (void)restartLiveView
+{
+ if ([self connected]) {
+ // Continue session
+ [self update];
+
+ [_stream getData:_sessionId];
+ }
+}
+
+/**
+ * Take photo
+ * After shooting, the status is checked by the timer and the file information is acquired when the status indicates that the process is complete.
+ * @return Information on shot media files
+ */
+- (HttpImageInfo*)takePicture
+{
+ // Stop live view
+ [_stream cancel];
+
+ // Set still image as shooting mode
+ // Continue session
+ [self setOptions:@{@"captureMode":@"image"}];
+
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.takePicture",
+ @"parameters":
+ @{@"sessionId": self->_sessionId}};
+
+ // Set the request-body.
+ [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ __block NSString *commandId;
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ commandId = [array valueForKey:@"id"];
+ NSLog(@"commandId: %@", commandId);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+ HttpImageInfo *resultInfo = [self waitCommandComplete:commandId];
+
+ // Resume live view
+ [_stream getData:_sessionId];
+
+ return resultInfo;
+}
+
+/**
+ * Check status of specified command and acquire information
+ * @param commandId ID of command to be checked
+ */
+- (HttpImageInfo*)waitCommandComplete:(NSString*)commandId
+{
+ if (commandId != nil) {
+ // Create timer and wait until process is completed
+ NSMutableURLRequest *requestForStatus = [self createRequest:@"/osc/commands/status" method:@"POST"];
+ HttpStatusTimer *timer = [[HttpStatusTimer alloc] initWithRequest:requestForStatus];
+ NSString *status = [timer run:commandId];
+
+ if ([status isEqualToString:@"done"]) {
+ // Create the url-request.
+ NSMutableURLRequest *requestForList = [self createExecuteRequest];
+ HttpFileList *fileList = [[HttpFileList alloc] initWithRequest:requestForList];
+
+ NSString* token;
+ do {
+ token = [fileList getList:1];
+ HttpImageInfo *info = fileList.infoArray.firstObject;
+ if ([info.file_id isEqualToString:timer.fileUri]) {
+ return info;
+ }
+ } while ([token length] != 0);
+ }
+ }
+ return nil;
+}
+
+/**
+ * Delete specified file
+ * @param info Information of file to be deleted
+ * @return Delete process successful?
+ */
+- (BOOL)deleteImage:(HttpImageInfo*)info
+{
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.delete",
+ @"parameters":
+ @{@"fileUri": info.file_id}};
+
+ // Set the request-body.
+ [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ __block NSString *status;
+ __block NSString *commandId = nil;
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ status = [array valueForKey:@"state"];
+ commandId = [array valueForKey:@"id"];
+ NSLog(@"commandId: %@", commandId);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+ if ([status isEqualToString:@"done"]) {
+ return YES;
+ } else if (commandId != nil) {
+ // Create timer and wait until process is completed
+ NSMutableURLRequest *requestForStatus = [self createRequest:@"/osc/commands/status" method:@"POST"];
+ HttpStatusTimer *timer = [[HttpStatusTimer alloc] initWithRequest:requestForStatus];
+ status = [timer run:commandId];
+ if ([status isEqualToString:@"done"]) {
+ return YES;
+ }
+ }
+ return NO;
+}
+
+/**
+ * Create HTTP request class instance for executing command
+ * @return HTTP request class instance for executing command
+ */
+- (NSMutableURLRequest*)createExecuteRequest
+{
+ // Create the url-request.
+ return [self createRequest:@"/osc/commands/execute" method:@"POST"];
+}
+
+#pragma mark - Private methods.
+
+/**
+ * Send option setting request
+ * @param options Dictionary in which the option name and settings were configured for the key and value
+ */
+- (void)setOptions:(NSDictionary*)options
+{
+ // Continue session
+ [self update];
+
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [self createExecuteRequest];
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.setOptions",
+ @"parameters":
+ @{@"sessionId": self->_sessionId,
+ @"options":options}};
+
+ // Set the request-body.
+ [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [self->_session dataTaskWithRequest:request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSLog(@"result: %@", response);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+}
+
+/**
+ * Create HTTP request
+ * @param protocol Path
+ * @param method Protocol
+ * @return HTTP request instance
+ */
+- (NSMutableURLRequest*)createRequest:(NSString* const)protocol method:(NSString* const)method
+{
+ NSString *string = [NSString stringWithFormat:@"http://%@%@", self->_server, protocol];
+ NSURL *url = [NSURL URLWithString:string];
+
+ // Create the url-request.
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+
+ // Set the method(HTTP-POST)
+ [request setHTTPMethod:method];
+
+ [request setValue:@"application/json; charaset=utf-8" forHTTPHeaderField:@"Content-Type"];
+
+ return request;
+}
+
@end
\ No newline at end of file
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.h
index c209a91..7bf59b3 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.h
@@ -1,30 +1,30 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-/**
- * Device information class
- */
-@interface HttpDeviceInfo : NSObject
-
-/**
- * Model name
- */
-@property (nonatomic) NSString* model;
-/**
- * Firmware version
- */
-@property (nonatomic) NSString* firmware_version;
-/**
- * Serial number
- */
-@property (nonatomic) NSString* serial_number;
-
-/**
- * Device information represented as character string
- */
-- (NSString*)description;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+/**
+ * Device information class
+ */
+@interface HttpDeviceInfo : NSObject
+
+/**
+ * Model name
+ */
+@property (nonatomic) NSString* model;
+/**
+ * Firmware version
+ */
+@property (nonatomic) NSString* firmware_version;
+/**
+ * Serial number
+ */
+@property (nonatomic) NSString* serial_number;
+
+/**
+ * Device information represented as character string
+ */
+- (NSString*)description;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.m
index 069b6f6..b2624e0 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpDeviceInfo.m
@@ -1,18 +1,18 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpDeviceInfo.h"
-
-@implementation HttpDeviceInfo
-
-- (NSString*)description
-{
- NSMutableString* string = [NSMutableString string];
- [string appendFormat:@" model=%@", self->_model];
- [string appendFormat:@" firmware_version=%@", self->_firmware_version];
- [string appendFormat:@" serial_number=%@", self->_serial_number];
- return string;
-}
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpDeviceInfo.h"
+
+@implementation HttpDeviceInfo
+
+- (NSString*)description
+{
+ NSMutableString* string = [NSMutableString string];
+ [string appendFormat:@" model=%@", self->_model];
+ [string appendFormat:@" firmware_version=%@", self->_firmware_version];
+ [string appendFormat:@" serial_number=%@", self->_serial_number];
+ return string;
+}
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.h
index 17a4944..7c82fa1 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.h
@@ -1,15 +1,15 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-@interface HttpFileList : NSObject
-
-@property (readonly) NSMutableArray *infoArray;
-
-- (id)initWithRequest:(NSMutableURLRequest*)request;
-
-- (NSString*)getList:(NSUInteger)numItems;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+@interface HttpFileList : NSObject
+
+@property (readonly) NSMutableArray *infoArray;
+
+- (id)initWithRequest:(NSMutableURLRequest*)request;
+
+- (NSString*)getList:(NSUInteger)numItems;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.m
index f7e83c3..9c31e7d 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpFileList.m
@@ -1,110 +1,110 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpFileList.h"
-#import "HttpImageInfo.h"
-
-/**
- * Acquisition class of media file information
- * If an acquisition method is called after an instance is generated, acquisition begins from the start of the list. Subsequent acquisitions begin from the token position that has been kept
- * Nil is returned by the acquisition method when acquisition of the information reaches the end of the list. This value is therefore used to judge whether acquisition has reached the end.
- */
-@interface HttpFileList()
-{
- NSString *_currentToken;
- NSMutableURLRequest *_request;
- NSURLSession *_session;
-}
-@end
-
-@implementation HttpFileList
-
-/**
- * Specified initializer
- * @param request HTTP request
- * @return Instance
- */
-- (id)initWithRequest:(NSMutableURLRequest*)request
-{
- if ([super init]) {
- _currentToken = @"";
- _request = request;
-
- // Create and keep HTTP session
- NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
- _session= [NSURLSession sessionWithConfiguration:config];
-
- _infoArray = nil;
- }
- return self;
-}
-
-/**
- * Acquire information on multiple files together
- * @param numItems Number of files for which to acquire information
- * @return Newly acquired token. Nil returned when acquisition reaches end of list
- */
-- (NSString*)getList:(NSUInteger)numItems
-{
- // Generate NSMutableArray first time only
- if (_infoArray == nil) {
- _infoArray = [NSMutableArray arrayWithCapacity:numItems];
- }
-
- // Semaphore for synchronization
- dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera._listAll",
- @"parameters":
- @{@"entryCount":[NSNumber numberWithUnsignedInteger:numItems], // Number of still image and video files to be acquired
- @"continuationToken": _currentToken, // Token for resuming loading from previous _listAll
- @"detail": @YES} // Acquire file details?
- };
- NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
-
- // Set the request-body.
- [_request setHTTPBody:json];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [_session dataTaskWithRequest:_request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- NSArray* results = [array valueForKey:@"results"];
- NSArray* entries = [results valueForKey:@"entries"];
- _currentToken = [results valueForKey:@"continuationToken"];
-
- NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
- [formatter setDateFormat:@"yyyy:MM:dd HH:mm:ssZ"];
-
- // Repeat for each acquired object
- NSUInteger entriesCount = [entries count];
- for (int i = 0; i < entriesCount; i++) {
- NSArray* entry = [entries objectAtIndex:i];
- HttpImageInfo* info = [[HttpImageInfo alloc] init];
- info.file_name = [entry valueForKey:@"name"];
- info.file_id = [entry valueForKey:@"uri"];
- info.file_size = [[entry valueForKey:@"size"] longValue]; // File size (bytes)
- info.capture_date = [formatter dateFromString:[entry valueForKey:@"dateTimeZone"]];
- info.image_pix_width = [[entry valueForKey:@"width"] longValue];
- info.image_pix_height = [[entry valueForKey:@"height"] longValue];
- info.file_format = [entry valueForKey:@"recordTime"] ? CODE_MPEG : CODE_JPEG;
- [self->_infoArray addObject:info];
- }
- NSLog(@"result: %@", entries);
- } else {
- NSLog(@"error: %@", error);
- }
- dispatch_semaphore_signal(semaphore);
- }];
- [task resume];
-
- // Wait until finished using semaphore
- dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
- return _currentToken;
-}
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpFileList.h"
+#import "HttpImageInfo.h"
+
+/**
+ * Acquisition class of media file information
+ * If an acquisition method is called after an instance is generated, acquisition begins from the start of the list. Subsequent acquisitions begin from the token position that has been kept
+ * Nil is returned by the acquisition method when acquisition of the information reaches the end of the list. This value is therefore used to judge whether acquisition has reached the end.
+ */
+@interface HttpFileList()
+{
+ NSString *_currentToken;
+ NSMutableURLRequest *_request;
+ NSURLSession *_session;
+}
+@end
+
+@implementation HttpFileList
+
+/**
+ * Specified initializer
+ * @param request HTTP request
+ * @return Instance
+ */
+- (id)initWithRequest:(NSMutableURLRequest*)request
+{
+ if ([super init]) {
+ _currentToken = @"";
+ _request = request;
+
+ // Create and keep HTTP session
+ NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+ _session= [NSURLSession sessionWithConfiguration:config];
+
+ _infoArray = nil;
+ }
+ return self;
+}
+
+/**
+ * Acquire information on multiple files together
+ * @param numItems Number of files for which to acquire information
+ * @return Newly acquired token. Nil returned when acquisition reaches end of list
+ */
+- (NSString*)getList:(NSUInteger)numItems
+{
+ // Generate NSMutableArray first time only
+ if (_infoArray == nil) {
+ _infoArray = [NSMutableArray arrayWithCapacity:numItems];
+ }
+
+ // Semaphore for synchronization
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera._listAll",
+ @"parameters":
+ @{@"entryCount":[NSNumber numberWithUnsignedInteger:numItems], // Number of still image and video files to be acquired
+ @"continuationToken": _currentToken, // Token for resuming loading from previous _listAll
+ @"detail": @YES} // Acquire file details?
+ };
+ NSData *json = [NSJSONSerialization dataWithJSONObject:body options:0 error:nil];
+
+ // Set the request-body.
+ [_request setHTTPBody:json];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [_session dataTaskWithRequest:_request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ NSArray* results = [array valueForKey:@"results"];
+ NSArray* entries = [results valueForKey:@"entries"];
+ _currentToken = [results valueForKey:@"continuationToken"];
+
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ [formatter setDateFormat:@"yyyy:MM:dd HH:mm:ssZ"];
+
+ // Repeat for each acquired object
+ NSUInteger entriesCount = [entries count];
+ for (int i = 0; i < entriesCount; i++) {
+ NSArray* entry = [entries objectAtIndex:i];
+ HttpImageInfo* info = [[HttpImageInfo alloc] init];
+ info.file_name = [entry valueForKey:@"name"];
+ info.file_id = [entry valueForKey:@"uri"];
+ info.file_size = [[entry valueForKey:@"size"] longValue]; // File size (bytes)
+ info.capture_date = [formatter dateFromString:[entry valueForKey:@"dateTimeZone"]];
+ info.image_pix_width = [[entry valueForKey:@"width"] longValue];
+ info.image_pix_height = [[entry valueForKey:@"height"] longValue];
+ info.file_format = [entry valueForKey:@"recordTime"] ? CODE_MPEG : CODE_JPEG;
+ [self->_infoArray addObject:info];
+ }
+ NSLog(@"result: %@", entries);
+ } else {
+ NSLog(@"error: %@", error);
+ }
+ dispatch_semaphore_signal(semaphore);
+ }];
+ [task resume];
+
+ // Wait until finished using semaphore
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ return _currentToken;
+}
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.h
index 9f5fd18..03288f8 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.h
@@ -1,49 +1,49 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-/**
- * Media format type
- */
-enum IMAGE_FORMAT : NSInteger {
- CODE_JPEG,
- CODE_MPEG,
-};
-
-/**
- * Information class of media file
- */
-@interface HttpImageInfo : NSObject
-
-/**
- * Media format
- */
-@property (nonatomic) enum IMAGE_FORMAT file_format;
-/**
- * File size
- */
-@property (nonatomic) NSUInteger file_size;
-/**
- * Image width
- */
-@property (nonatomic) NSUInteger image_pix_width;
-/**
- * Image height
- */
-@property (nonatomic) NSUInteger image_pix_height;
-/**
- * File name
- */
-@property (nonatomic) NSString* file_name;
-/**
- * File creation/update time
- */
-@property (nonatomic) NSDate* capture_date;
-/**
- * File ID
- */
-@property (nonatomic) NSString* file_id;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+/**
+ * Media format type
+ */
+enum IMAGE_FORMAT : NSInteger {
+ CODE_JPEG,
+ CODE_MPEG,
+};
+
+/**
+ * Information class of media file
+ */
+@interface HttpImageInfo : NSObject
+
+/**
+ * Media format
+ */
+@property (nonatomic) enum IMAGE_FORMAT file_format;
+/**
+ * File size
+ */
+@property (nonatomic) NSUInteger file_size;
+/**
+ * Image width
+ */
+@property (nonatomic) NSUInteger image_pix_width;
+/**
+ * Image height
+ */
+@property (nonatomic) NSUInteger image_pix_height;
+/**
+ * File name
+ */
+@property (nonatomic) NSString* file_name;
+/**
+ * File creation/update time
+ */
+@property (nonatomic) NSDate* capture_date;
+/**
+ * File ID
+ */
+@property (nonatomic) NSString* file_id;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.m
index 3d9614f..c3deb4d 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpImageInfo.m
@@ -1,23 +1,23 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpImageInfo.h"
-
-@implementation HttpImageInfo
-
--(NSString*)description
-{
- NSMutableString* s = [NSMutableString stringWithString:@""];
- return s;
-}
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpImageInfo.h"
+
+@implementation HttpImageInfo
+
+-(NSString*)description
+{
+ NSMutableString* s = [NSMutableString stringWithString:@""];
+ return s;
+}
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.h
index 0e73942..9a62120 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.h
@@ -1,19 +1,19 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-/**
- * Class for downloading files via HTTP
- */
-@interface HttpSession : NSObject
-
-- (id)initWithRequest:(NSMutableURLRequest*)request;
-
-- (void)getResizedImageObject:(NSString*)fileUri
- onStart:(void(^)(int64_t expectedTotalBytes))startBlock
- onWrite:(void(^)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))writeBlock
- onFinish:(void(^)(NSURL *location))finishBlock;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+/**
+ * Class for downloading files via HTTP
+ */
+@interface HttpSession : NSObject
+
+- (id)initWithRequest:(NSMutableURLRequest*)request;
+
+- (void)getResizedImageObject:(NSString*)fileUri
+ onStart:(void(^)(int64_t expectedTotalBytes))startBlock
+ onWrite:(void(^)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))writeBlock
+ onFinish:(void(^)(NSURL *location))finishBlock;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.m
index 02160d4..509e24c 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpSession.m
@@ -1,105 +1,105 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpSession.h"
-
-/**
- * File download class
- */
-@interface HttpSession()
-{
- NSMutableURLRequest* _request;
- NSURLSession *_session;
- void (^onStart)(int64_t expectedTotalBytes);
- void (^onWrite)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite);
- void (^onFinish)(NSURL *location);
-}
-@end
-
-@implementation HttpSession
-
-/**
- * Specified initializer
- * @param request HTTP request
- * @return Instance
- */
-- (id)initWithRequest:(NSMutableURLRequest*)request
-{
- if (self = [super init]) {
- self->_request = request;
- }
- return self;
-}
-
-/**
- * Download file with specified file ID
- * @param fileUri ID of file to be downloaded
- * @param startBlock Block to be called on start of download
- * @param writeBlock Blocks to be called successively during download
- * @param finishBlock Block to be called at end of download
- */
-- (void)getResizedImageObject:(NSString*)fileUri
- onStart:(void(^)(int64_t expectedTotalBytes))startBlock
- onWrite:(void(^)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))writeBlock
- onFinish:(void(^)(NSURL *location))finishBlock
-{
- self->onStart = startBlock;
- self->onWrite = writeBlock;
- self->onFinish = finishBlock;
-
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera.getImage",
- @"parameters":
- @{@"fileUri": fileUri, // ID of file to be acquired
- @"_type": @"full"}}; // Type of file to be acquired
-
- // Set the request-body.
- [self->_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
- _session = [NSURLSession sessionWithConfiguration:config
- delegate:self
- delegateQueue:[NSOperationQueue mainQueue]];
-
- // Download data as file
- NSURLSessionDownloadTask* task = [_session downloadTaskWithRequest:self->_request];
- [task resume];
-}
-
-/**
- * Delegate to be called on start of download
- * @param session Session
- * @param downloadTask Task
- * @param fileOffset Acquired byte count on disk
- * @param expectedTotalBytes Predicted byte count of entire acquired file
- */
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes
-{
- self->onStart(expectedTotalBytes);
-}
-
-/**
- * Delegates to be called successively during download
- * @param session Session
- * @param downloadTask Task
- * @param bytesWritten Byte count transferred each time a delegate method is called
- * @param totalBytesWritten Current total transferred byte count
- * @param totalBytesExpectedToWrite Predicted byte count of acquired file
- */
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
-{
- self->onWrite(totalBytesWritten, totalBytesExpectedToWrite);
-}
-
-/**
- * Delegate to be called at end of download
- * @param session Session
- * @param downloadTask Task
- * @param location File URL of acquired temporary file
- */
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
-{
- self->onFinish(location);
-}
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpSession.h"
+
+/**
+ * File download class
+ */
+@interface HttpSession()
+{
+ NSMutableURLRequest* _request;
+ NSURLSession *_session;
+ void (^onStart)(int64_t expectedTotalBytes);
+ void (^onWrite)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite);
+ void (^onFinish)(NSURL *location);
+}
+@end
+
+@implementation HttpSession
+
+/**
+ * Specified initializer
+ * @param request HTTP request
+ * @return Instance
+ */
+- (id)initWithRequest:(NSMutableURLRequest*)request
+{
+ if (self = [super init]) {
+ self->_request = request;
+ }
+ return self;
+}
+
+/**
+ * Download file with specified file ID
+ * @param fileUri ID of file to be downloaded
+ * @param startBlock Block to be called on start of download
+ * @param writeBlock Blocks to be called successively during download
+ * @param finishBlock Block to be called at end of download
+ */
+- (void)getResizedImageObject:(NSString*)fileUri
+ onStart:(void(^)(int64_t expectedTotalBytes))startBlock
+ onWrite:(void(^)(int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))writeBlock
+ onFinish:(void(^)(NSURL *location))finishBlock
+{
+ self->onStart = startBlock;
+ self->onWrite = writeBlock;
+ self->onFinish = finishBlock;
+
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera.getImage",
+ @"parameters":
+ @{@"fileUri": fileUri, // ID of file to be acquired
+ @"_type": @"full"}}; // Type of file to be acquired
+
+ // Set the request-body.
+ [self->_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+ _session = [NSURLSession sessionWithConfiguration:config
+ delegate:self
+ delegateQueue:[NSOperationQueue mainQueue]];
+
+ // Download data as file
+ NSURLSessionDownloadTask* task = [_session downloadTaskWithRequest:self->_request];
+ [task resume];
+}
+
+/**
+ * Delegate to be called on start of download
+ * @param session Session
+ * @param downloadTask Task
+ * @param fileOffset Acquired byte count on disk
+ * @param expectedTotalBytes Predicted byte count of entire acquired file
+ */
+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes
+{
+ self->onStart(expectedTotalBytes);
+}
+
+/**
+ * Delegates to be called successively during download
+ * @param session Session
+ * @param downloadTask Task
+ * @param bytesWritten Byte count transferred each time a delegate method is called
+ * @param totalBytesWritten Current total transferred byte count
+ * @param totalBytesExpectedToWrite Predicted byte count of acquired file
+ */
+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
+{
+ self->onWrite(totalBytesWritten, totalBytesExpectedToWrite);
+}
+
+/**
+ * Delegate to be called at end of download
+ * @param session Session
+ * @param downloadTask Task
+ * @param location File URL of acquired temporary file
+ */
+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
+{
+ self->onFinish(location);
+}
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.h
index a3d1c66..165495f 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.h
@@ -1,15 +1,15 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-@interface HttpStatusTimer : NSObject
-
-@property (readonly) NSString* fileUri;
-
-- (id)initWithRequest:(NSMutableURLRequest*)request;
-
-- (NSString*)run:(NSString*)command;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+@interface HttpStatusTimer : NSObject
+
+@property (readonly) NSString* fileUri;
+
+- (id)initWithRequest:(NSMutableURLRequest*)request;
+
+- (NSString*)run:(NSString*)command;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.m
index 8c32c04..fec04ff 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStatusTimer.m
@@ -1,100 +1,100 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpStatusTimer.h"
-
-/**
- * Class for periodic monitoring of command status
- */
-@interface HttpStatusTimer()
-{
- NSMutableURLRequest *_request;
- NSURLSession* _session;
- NSString *_commandId;
- dispatch_semaphore_t _semaphore;
- NSString *_state;
-}
-@end
-
-@implementation HttpStatusTimer
-
-/**
- * Specified initializer
- * @param request HTTP request
- * @return Instance
- */
-- (id)initWithRequest:(NSMutableURLRequest*)request
-{
- if ([super init]) {
- _request = request;
- }
- return self;
-}
-
-/**
- * Start status monitoring
- * @param command ID of command to be monitored
- * @return Status indicating completion or error
- */
-- (NSString*)run:(NSString*)command
-{
- // Create and keep HTTP session
- NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
- _session= [NSURLSession sessionWithConfiguration:config];
-
- _commandId = command;
-
- // Semaphore for synchronization (cannot be entered until signal is called)
- _semaphore = dispatch_semaphore_create(0);
-
- // Create and start timer
- NSTimer *timer = [NSTimer timerWithTimeInterval:0.5f
- target:self
- selector:@selector(getState:)
- userInfo:nil
- repeats:YES];
- NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
- [runLoop addTimer:timer forMode:NSRunLoopCommonModes];
- [runLoop run];
-
- // Wait until signal is called
- dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER);
- return _state;
-}
-
-/**
- * Delegate called during each set period of time
- * @param timer Timer
- */
-- (void)getState:(NSTimer*)timer
-{
- // Create JSON data
- NSDictionary *body = @{@"id": _commandId};
-
- // Set the request-body.
- [_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- // Send the url-request.
- NSURLSessionDataTask* task =
- [_session dataTaskWithRequest:_request
- completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (!error) {
- NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
- _state = [array valueForKey:@"state"];
- _fileUri = [array valueForKeyPath:@"results.fileUri"];
- NSLog(@"result: %@", _state);
- } else {
- _state = @"error";
- NSLog(@"GetStorageInfo: received data is invalid.");
- }
- if (![_state isEqualToString:@"inProgress"]) {
- dispatch_semaphore_signal(_semaphore);
-
- // Stop timer
- [timer invalidate];
- }
- }];
- [task resume];
-}
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpStatusTimer.h"
+
+/**
+ * Class for periodic monitoring of command status
+ */
+@interface HttpStatusTimer()
+{
+ NSMutableURLRequest *_request;
+ NSURLSession* _session;
+ NSString *_commandId;
+ dispatch_semaphore_t _semaphore;
+ NSString *_state;
+}
+@end
+
+@implementation HttpStatusTimer
+
+/**
+ * Specified initializer
+ * @param request HTTP request
+ * @return Instance
+ */
+- (id)initWithRequest:(NSMutableURLRequest*)request
+{
+ if ([super init]) {
+ _request = request;
+ }
+ return self;
+}
+
+/**
+ * Start status monitoring
+ * @param command ID of command to be monitored
+ * @return Status indicating completion or error
+ */
+- (NSString*)run:(NSString*)command
+{
+ // Create and keep HTTP session
+ NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+ _session= [NSURLSession sessionWithConfiguration:config];
+
+ _commandId = command;
+
+ // Semaphore for synchronization (cannot be entered until signal is called)
+ _semaphore = dispatch_semaphore_create(0);
+
+ // Create and start timer
+ NSTimer *timer = [NSTimer timerWithTimeInterval:0.5f
+ target:self
+ selector:@selector(getState:)
+ userInfo:nil
+ repeats:YES];
+ NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+ [runLoop addTimer:timer forMode:NSRunLoopCommonModes];
+ [runLoop run];
+
+ // Wait until signal is called
+ dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER);
+ return _state;
+}
+
+/**
+ * Delegate called during each set period of time
+ * @param timer Timer
+ */
+- (void)getState:(NSTimer*)timer
+{
+ // Create JSON data
+ NSDictionary *body = @{@"id": _commandId};
+
+ // Set the request-body.
+ [_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ // Send the url-request.
+ NSURLSessionDataTask* task =
+ [_session dataTaskWithRequest:_request
+ completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (!error) {
+ NSArray* array = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:nil];
+ _state = [array valueForKey:@"state"];
+ _fileUri = [array valueForKeyPath:@"results.fileUri"];
+ NSLog(@"result: %@", _state);
+ } else {
+ _state = @"error";
+ NSLog(@"GetStorageInfo: received data is invalid.");
+ }
+ if (![_state isEqualToString:@"inProgress"]) {
+ dispatch_semaphore_signal(_semaphore);
+
+ // Stop timer
+ [timer invalidate];
+ }
+ }];
+ [task resume];
+}
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.h
index a0dd175..e53169c 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.h
@@ -1,33 +1,33 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-/**
- * Device storage information and size of shot image
- */
-@interface HttpStorageInfo : NSObject
-
-/**
- * Total storage capacity
- */
-@property (nonatomic) unsigned long max_capacity;
-/**
- * Remaining capacity
- */
-@property (nonatomic) unsigned long free_space_in_bytes;
-/**
- * Remaining number of photos
- */
-@property (nonatomic) unsigned long free_space_in_images;
-/**
- * Image width for shooting still images
- */
-@property (nonatomic) unsigned long image_width;
-/**
- * Image height for shooting still images
- */
-@property (nonatomic) unsigned long image_height;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+/**
+ * Device storage information and size of shot image
+ */
+@interface HttpStorageInfo : NSObject
+
+/**
+ * Total storage capacity
+ */
+@property (nonatomic) unsigned long max_capacity;
+/**
+ * Remaining capacity
+ */
+@property (nonatomic) unsigned long free_space_in_bytes;
+/**
+ * Remaining number of photos
+ */
+@property (nonatomic) unsigned long free_space_in_images;
+/**
+ * Image width for shooting still images
+ */
+@property (nonatomic) unsigned long image_width;
+/**
+ * Image height for shooting still images
+ */
+@property (nonatomic) unsigned long image_height;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.m
index d83ebfc..4d4ac52 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStorageInfo.m
@@ -1,9 +1,9 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpStorageInfo.h"
-
-@implementation HttpStorageInfo
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpStorageInfo.h"
+
+@implementation HttpStorageInfo
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.h b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.h
index 3f866ab..6d88d7d 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.h
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.h
@@ -1,17 +1,17 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-@interface HttpStream : NSObject
-
-- (void)setDelegate:(void(^)(NSData *frameData))bufferBlock;
-
-- (id)initWithRequest:(NSMutableURLRequest*)request;
-
-- (void)getData:(NSString*)sessionId;
-
-- (void)cancel;
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+@interface HttpStream : NSObject
+
+- (void)setDelegate:(void(^)(NSData *frameData))bufferBlock;
+
+- (id)initWithRequest:(NSMutableURLRequest*)request;
+
+- (void)getData:(NSString*)sessionId;
+
+- (void)cancel;
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.m
index fe8f446..de85df8 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/http/HttpStream.m
@@ -1,161 +1,161 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import "HttpStream.h"
-
-// Start and end markers for images in JPEG format
-const Byte SOI_MARKER[] = {0xFF, 0xD8};
-const Byte EOI_MARKER[] = {0xFF, 0xD9};
-
-/**
- * Live view data acquisition class
- */
-@interface HttpStream()
-{
- NSMutableURLRequest *_request;
- NSMutableData *_buffer;
- NSMutableArray *_frameArray;
- NSURLSessionDataTask *_task;
- void (^_onBuffered)(NSData *frameData);
- BOOL _isContinue;
-}
-@end
-
-@implementation HttpStream
-
-/**
- * Set block to be executed when receiving data
- * @param bufferBlock Block to be executed when receiving data
- */
-- (void)setDelegate:(void(^)(NSData *frameData))bufferBlock
-{
- _onBuffered = bufferBlock;
-}
-
-/**
- * Specified initializer
- * @param request HTTP request
- * @return Instance
- */
-- (id)initWithRequest:(NSMutableURLRequest*)request
-{
- if (self = [super init]) {
- _request = request;
- _buffer = [NSMutableData data];
- _frameArray = [NSMutableArray array];
- _isContinue = NO;
- }
- return self;
-}
-
-/**
- * Start data acquisition
- * @param sessionId Session ID
- */
-- (void)getData:(NSString*)sessionId
-{
- if (!_isContinue) {
- // Create JSON data
- NSDictionary *body = @{@"name": @"camera._getLivePreview",
- @"parameters":
- @{@"sessionId": sessionId}};
-
- // Set the request-body.
- [self->_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
-
- NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
- NSURLSession* session = [NSURLSession sessionWithConfiguration:config
- delegate:self
- delegateQueue:[NSOperationQueue mainQueue]];
-
- // Start data acquisition task
- _task = [session dataTaskWithRequest:_request];
- [_task resume];
- _isContinue = YES;
- }
-}
-
-/**
- * Stop data acquisition task
- */
-- (void)cancel
-{
- [_task cancel];
-}
-
-/**
- * Delegate for notification that part of the data has been received by the data acquisition task
- * @param session Session
- * @param dataTask Task
- * @param data Received data
- */
-- (void)URLSession:(NSURLSession *)session
- dataTask:(NSURLSessionDataTask *)dataTask
- didReceiveData:(NSData *)data
-{
- [_buffer appendData:data];
- Byte b1[2];
-
- // Search for SOI marker position from buffer
- NSUInteger soi;
- NSUInteger eoi;
- do {
- soi = 0;
- eoi = 0;
- NSInteger i = 0;
-
- for (; i < (NSInteger)_buffer.length - 1; i++) {
- [_buffer getBytes:b1 range:NSMakeRange(i, 2)];
- if (SOI_MARKER[0] == b1[0]) {
- if (SOI_MARKER[1] == b1[1]) {
- soi = i;
- break;
- }
- }
- }
-
- for (; i < (NSInteger)_buffer.length - 1; i++) {
- [_buffer getBytes:b1 range:NSMakeRange(i, 2)];
- if (EOI_MARKER[0] == b1[0]) {
- if (EOI_MARKER[1] == b1[1]) {
- eoi = i;
- break;
- }
- }
- }
-
- // Exit process if EOI not found
- if (eoi == 0) {
- return;
- }
- NSData *frameData = [_buffer subdataWithRange:NSMakeRange(soi, eoi - soi)];
-
- // Draw
- _onBuffered(frameData);
-
- // Delete used parts of data
- NSUInteger remainLength = _buffer.length - eoi - 2;
- Byte remain[remainLength];
- [_buffer getBytes:remain range:NSMakeRange(eoi + 2, remainLength)];
- _buffer = [NSMutableData dataWithBytes:remain length:remainLength];
- } while (0 < eoi);
-}
-
-/**
- * Delegate for notification that the data task has finished receiving data
- * @param session Session
- * @param task Task
- * @param error Error information
- */
-- (void)URLSession:(NSURLSession *)session
- task:(NSURLSessionTask *)task
-didCompleteWithError:(NSError *)error
-{
- // Called when session expires
- [session invalidateAndCancel];
- _isContinue = NO;
- NSLog(@"HttpStream didCompleteWithError: %@", error);
-}
-
-@end
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import "HttpStream.h"
+
+// Start and end markers for images in JPEG format
+const Byte SOI_MARKER[] = {0xFF, 0xD8};
+const Byte EOI_MARKER[] = {0xFF, 0xD9};
+
+/**
+ * Live view data acquisition class
+ */
+@interface HttpStream()
+{
+ NSMutableURLRequest *_request;
+ NSMutableData *_buffer;
+ NSMutableArray *_frameArray;
+ NSURLSessionDataTask *_task;
+ void (^_onBuffered)(NSData *frameData);
+ BOOL _isContinue;
+}
+@end
+
+@implementation HttpStream
+
+/**
+ * Set block to be executed when receiving data
+ * @param bufferBlock Block to be executed when receiving data
+ */
+- (void)setDelegate:(void(^)(NSData *frameData))bufferBlock
+{
+ _onBuffered = bufferBlock;
+}
+
+/**
+ * Specified initializer
+ * @param request HTTP request
+ * @return Instance
+ */
+- (id)initWithRequest:(NSMutableURLRequest*)request
+{
+ if (self = [super init]) {
+ _request = request;
+ _buffer = [NSMutableData data];
+ _frameArray = [NSMutableArray array];
+ _isContinue = NO;
+ }
+ return self;
+}
+
+/**
+ * Start data acquisition
+ * @param sessionId Session ID
+ */
+- (void)getData:(NSString*)sessionId
+{
+ if (!_isContinue) {
+ // Create JSON data
+ NSDictionary *body = @{@"name": @"camera._getLivePreview",
+ @"parameters":
+ @{@"sessionId": sessionId}};
+
+ // Set the request-body.
+ [self->_request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:0 error:nil]];
+
+ NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+ NSURLSession* session = [NSURLSession sessionWithConfiguration:config
+ delegate:self
+ delegateQueue:[NSOperationQueue mainQueue]];
+
+ // Start data acquisition task
+ _task = [session dataTaskWithRequest:_request];
+ [_task resume];
+ _isContinue = YES;
+ }
+}
+
+/**
+ * Stop data acquisition task
+ */
+- (void)cancel
+{
+ [_task cancel];
+}
+
+/**
+ * Delegate for notification that part of the data has been received by the data acquisition task
+ * @param session Session
+ * @param dataTask Task
+ * @param data Received data
+ */
+- (void)URLSession:(NSURLSession *)session
+ dataTask:(NSURLSessionDataTask *)dataTask
+ didReceiveData:(NSData *)data
+{
+ [_buffer appendData:data];
+ Byte b1[2];
+
+ // Search for SOI marker position from buffer
+ NSUInteger soi;
+ NSUInteger eoi;
+ do {
+ soi = 0;
+ eoi = 0;
+ NSInteger i = 0;
+
+ for (; i < (NSInteger)_buffer.length - 1; i++) {
+ [_buffer getBytes:b1 range:NSMakeRange(i, 2)];
+ if (SOI_MARKER[0] == b1[0]) {
+ if (SOI_MARKER[1] == b1[1]) {
+ soi = i;
+ break;
+ }
+ }
+ }
+
+ for (; i < (NSInteger)_buffer.length - 1; i++) {
+ [_buffer getBytes:b1 range:NSMakeRange(i, 2)];
+ if (EOI_MARKER[0] == b1[0]) {
+ if (EOI_MARKER[1] == b1[1]) {
+ eoi = i;
+ break;
+ }
+ }
+ }
+
+ // Exit process if EOI not found
+ if (eoi == 0) {
+ return;
+ }
+ NSData *frameData = [_buffer subdataWithRange:NSMakeRange(soi, eoi - soi)];
+
+ // Draw
+ _onBuffered(frameData);
+
+ // Delete used parts of data
+ NSUInteger remainLength = _buffer.length - eoi - 2;
+ Byte remain[remainLength];
+ [_buffer getBytes:remain range:NSMakeRange(eoi + 2, remainLength)];
+ _buffer = [NSMutableData dataWithBytes:remain length:remainLength];
+ } while (0 < eoi);
+}
+
+/**
+ * Delegate for notification that the data task has finished receiving data
+ * @param session Session
+ * @param task Task
+ * @param error Error information
+ */
+- (void)URLSession:(NSURLSession *)session
+ task:(NSURLSessionTask *)task
+didCompleteWithError:(NSError *)error
+{
+ // Called when session expires
+ [session invalidateAndCancel];
+ _isContinue = NO;
+ NSLog(@"HttpStream didCompleteWithError: %@", error);
+}
+
+@end
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/main.m b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/main.m
index 78d4b63..16ddbf4 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/main.m
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/main.m
@@ -1,14 +1,14 @@
-/*
- * Copyright Ricoh Company, Ltd. All rights reserved.
- */
-
-#import
-
-#import "AppDelegate.h"
-
-int main(int argc, char *argv[])
-{
- @autoreleasepool {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
- }
-}
+/*
+ * Copyright Ricoh Company, Ltd. All rights reserved.
+ */
+
+#import
+
+#import "AppDelegate.h"
+
+int main(int argc, char *argv[])
+{
+ @autoreleasepool {
+ return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+ }
+}
diff --git a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2-Info.plist b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2-Info.plist
index 9075057..552a76c 100755
--- a/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2-Info.plist
+++ b/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2/ricoh-theta-sample-for-iosv2-Info.plist
@@ -1,43 +1,43 @@
-
-
-
-
- CFBundleDevelopmentRegion
- en
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- 0.1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 0.1.0
- LSRequiresIPhoneOS
-
- NSAppTransportSecurity
-
- NSAllowsArbitraryLoads
-
-
- UIMainStoryboardFile
- MainStoryboard
- UIRequiredDeviceCapabilities
-
- armv7
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationPortrait
-
-
-
+
+
+
+
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${EXECUTABLE_NAME}
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${PRODUCT_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 0.1.1
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 0.1.1
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIMainStoryboardFile
+ MainStoryboard
+ UIRequiredDeviceCapabilities
+
+ armv7
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+
+
+