canonball 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5aa29b187c7d7d938e8a63c9a05e96ebc05c553
-  data.tar.gz: f662a4fb55cc1eba51e3f5379658fe5fe4812245
+  metadata.gz: 46dff7b0f15b03afe400f1d26b85f97764ffbfc7
+  data.tar.gz: 8be9475a5453bb67d48a913ac3a27578ff2fd4b6
 SHA512:
-  metadata.gz: 52894e7b5bccd621cdd6efb6b7c0f0c0d29d15accdb14f53e01fdc81afce89b149f556e75d981632cca71038071deef578a2bdfd01bea6bfcd5a54df1cbbe0e0
-  data.tar.gz: 28554c3ad2ff96adbf85cc52881841e345f1695b40bddb18c95ab3fbdd880bd79ef92316e082a33a585fff1ad88e4cf3af486596b021ec7e6fa179b120b15a39
+  metadata.gz: f42f9c56ce250c09f3fe113037a9b9aa10f8282bda3cce9bf6019665b8b7cf7e3efd0f237ddcbf15673e9ef950dde7e09bb43647eb3b53b55eca30ee4ebabd73
+  data.tar.gz: c8583358f8b6345569da264ceb899c28a25d8aacaca430b6990ba3ac1ae4d3345d2052bd487b3d203e24a7082033d92ad5176ce179d64b467555a2216e50ac9d

data/lib/canonball.rb

@@ -9,7 +9,9 @@ module Canonball
   attach_function :inialize_sdk, [], :int
   attach_function :terminate_sdk, [], :int
   attach_function :open_camera_session, [ :int ], :int
-  attach_function :close_camera_session, [ :int ], :int
-  attach_function :take_picture, [ :int ], :int
+  attach_function :close_camera_session, [], :int
+  attach_function :take_picture, [], :int
+  attach_function :press_shutter_button, [], :int
+  attach_function :press_shutter_button_non_af, [], :int
   attach_function :download_files, [ :int, :string], :int
 end

data/lib/canonball/version.rb

@@ -1,3 +1,3 @@
 module Canonball
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/src/canonball.cpp

@@ -7,6 +7,9 @@
 
 #include "headers/canonball.h"
 
+EdsCameraRef camera = NULL;
+EdsCameraListRef camera_list = NULL;
+
 int inialize_sdk() {
     return EdsInitializeSDK();
 }
@@ -17,33 +20,37 @@ int terminate_sdk() {
 
 int open_camera_session(int camera_index) {
     EdsError error = EDS_ERR_OK;
-    EdsCameraRef camera = NULL;
-    EdsCameraListRef camera_list = NULL;
     if (error == EDS_ERR_OK) error = EdsGetCameraList(&camera_list);
     if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera_list, camera_index, &camera);
     if (error == EDS_ERR_OK) error = EdsOpenSession(camera);
     return error;
 }
 
-int close_camera_session(int camera_index) {
+int close_camera_session() {
     EdsError error = EDS_ERR_OK;
-    EdsCameraRef camera = NULL;
-    EdsCameraListRef camera_list = NULL;
-    if (error == EDS_ERR_OK) error = EdsGetCameraList(&camera_list);
-    if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera_list, camera_index, &camera);
     if (error == EDS_ERR_OK) error = EdsCloseSession(camera);
     if (error == EDS_ERR_OK) error = EdsRelease(camera);
     if (error == EDS_ERR_OK) error = EdsRelease(camera_list);
     return error;
 }
 
-int take_picture(int camera_index) {
+int take_picture() {
     EdsError error = EDS_ERR_OK;
-    EdsCameraRef camera = NULL;
-    EdsCameraListRef camera_list = NULL;
-    if (error == EDS_ERR_OK) error = EdsGetCameraList(&camera_list);
-    if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera_list, camera_index, &camera);
-    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_TakePicture, 0);  
+    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_TakePicture, 0);
+    return error;
+}
+
+int press_shutter_button() {
+    EdsError error = EDS_ERR_OK;
+    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_PressShutterButton, kEdsCameraCommand_ShutterButton_Completely);
+    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_PressShutterButton, kEdsCameraCommand_ShutterButton_OFF);
+    return error;
+}
+
+int press_shutter_button_non_af() {
+    EdsError error = EDS_ERR_OK;
+    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_PressShutterButton, kEdsCameraCommand_ShutterButton_Completely_NonAF);
+    if (error == EDS_ERR_OK) error = EdsSendCommand(camera , kEdsCameraCommand_PressShutterButton, kEdsCameraCommand_ShutterButton_OFF);
     return error;
 }
 
@@ -60,10 +67,8 @@ int download_file(EdsDirectoryItemRef file_pointer, std::string folder){
     return error;
 }
 
-int download_files(int camera_index, const char* folder) {
+int download_files(int sd_card_index, const char* folder) {
     EdsError error = EDS_ERR_OK;
-    EdsCameraRef camera = NULL;
-    EdsCameraListRef camera_list = NULL;
 
     EdsUInt32 folder_count = 0;    
     EdsVolumeRef sd_card = NULL;
@@ -71,9 +76,7 @@ int download_files(int camera_index, const char* folder) {
     EdsDirectoryItemInfo folder_info;
 
     // Get DCIM folder
-    if (error == EDS_ERR_OK) error = EdsGetCameraList(&camera_list);
-    if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera_list, camera_index, &camera);
-    if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera, 0, &sd_card);
+    if (error == EDS_ERR_OK) error = EdsGetChildAtIndex(camera, sd_card_index, &sd_card);
 
     if (error == EDS_ERR_OK) error = EdsGetChildCount( sd_card, &folder_count);
     for(int i = 0; i < folder_count; i++){

data/src/headers/canonball.h

@@ -23,14 +23,22 @@ extern "C" {
 }
 
 extern "C" {
-    int close_camera_session(int camera_index);
+    int close_camera_session();
 }
 
 extern "C" {
-    int take_picture(int camera_index);
+    int take_picture();
 }
 
 extern "C" {
-  int download_files(int camera_index, const char* folder);
+    int press_shutter_button();
+}
+
+extern "C" {
+    int press_shutter_button_non_af();
+}
+
+extern "C" {
+  int download_files(int sd_card_index, const char* folder);
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canonball
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Christopher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler