canonball 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.DS_Store +0 -0
  3. data/lib/.DS_Store +0 -0
  4. data/lib/canonball/error_codes.rb +134 -134
  5. data/lib/canonball/version.rb +1 -1
  6. data/src/.DS_Store +0 -0
  7. data/src/Makefile +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6c664aea45ea7c8829fe5f11b537c5383e9bbf70
4
- data.tar.gz: 75680357f179a695de8dc01bb611934368122842
3
+ metadata.gz: 45be082d4a4020c2fa73ef8f6ae16703c7f881ca
4
+ data.tar.gz: e56765148f38959a6bbcc8e2ffa4bab18447409d
5
5
  SHA512:
6
- metadata.gz: 632e5110a13ee248621c689f4da1820e0f201a831da502948057c7fe386242a61221f255f4941115be812d45f5c15b6c1a58c02231006cf0f6a388a040b65819
7
- data.tar.gz: 52996b9c68d51b0b3f0919732c155b59c81bdececaefc4b944df81b6278ff10255ff14a553803a27a8abfd38b4e2ae7e840cacbf79785895343422389985e4b1
6
+ metadata.gz: bd06de4d70b37d2f049256fddab74b7dd4b9f7920f156bac5004f3b17d646fdf643ddc043c1151b6a4282bd489823e05f4216fe84d8a37a97ad00f1d3df5cbcd
7
+ data.tar.gz: a9efc4a95b23d2e443c9f4b96c28be772aea091345e36308af0adff874484eebcaecb07185a3b243eeb894e6decf5007f95df344aac6cc174fd0024725510b8d
data/.DS_Store CHANGED
Binary file
data/lib/.DS_Store CHANGED
Binary file
data/lib/canonball/error_codes.rb CHANGED
@@ -1,152 +1,152 @@
1
1
  module Canonball
2
2
  # ED-SDK Error Code Masks
3
- EDS_ISSPECIFIC_MASK = 0
4
- EDS_COMPONENTID_MASK = 0
5
- EDS_RESERVED_MASK = 16711680
6
- EDS_ERRORID_MASK = 65535
3
+ @@EDS_ISSPECIFIC_MASK = 0
4
+ @@EDS_COMPONENTID_MASK = 0
5
+ @@EDS_RESERVED_MASK = 16711680
6
+ @@EDS_ERRORID_MASK = 65535
7
7
  # ED-SDK Base Component IDs
8
- EDS_CMP_ID_CLIENT_COMPONENTID = 16777216
9
- EDS_CMP_ID_LLSDK_COMPONENTID = 33554432
10
- EDS_CMP_ID_HLSDK_COMPONENTID = 50331648
8
+ @@EDS_CMP_ID_CLIENT_COMPONENTID = 16777216
9
+ @@EDS_CMP_ID_LLSDK_COMPONENTID = 33554432
10
+ @@EDS_CMP_ID_HLSDK_COMPONENTID = 50331648
11
11
  # ED-SDK Functin Success Code
12
- EDS_ERR_OK = 0
12
+ @@EDS_ERR_OK = 0
13
13
  # Miscellaneous errors
14
- EDS_ERR_UNIMPLEMENTED = 1
15
- EDS_ERR_INTERNAL_ERROR = 2
16
- EDS_ERR_MEM_ALLOC_FAILED = 3
17
- EDS_ERR_MEM_FREE_FAILED = 4
18
- EDS_ERR_OPERATION_CANCELLED = 5
19
- EDS_ERR_INCOMPATIBLE_VERSION = 6
20
- EDS_ERR_NOT_SUPPORTED = 7
21
- EDS_ERR_UNEXPECTED_EXCEPTION = 8
22
- EDS_ERR_PROTECTION_VIOLATION = 9
23
- EDS_ERR_MISSING_SUBCOMPONENT = 10
24
- EDS_ERR_SELECTION_UNAVAILABLE = 11
14
+ @@EDS_ERR_UNIMPLEMENTED = 1
15
+ @@EDS_ERR_INTERNAL_ERROR = 2
16
+ @@EDS_ERR_MEM_ALLOC_FAILED = 3
17
+ @@EDS_ERR_MEM_FREE_FAILED = 4
18
+ @@EDS_ERR_OPERATION_CANCELLED = 5
19
+ @@EDS_ERR_INCOMPATIBLE_VERSION = 6
20
+ @@EDS_ERR_NOT_SUPPORTED = 7
21
+ @@EDS_ERR_UNEXPECTED_EXCEPTION = 8
22
+ @@EDS_ERR_PROTECTION_VIOLATION = 9
23
+ @@EDS_ERR_MISSING_SUBCOMPONENT = 10
24
+ @@EDS_ERR_SELECTION_UNAVAILABLE = 11
25
25
  # File errors
26
- EDS_ERR_FILE_IO_ERROR = 32
27
- EDS_ERR_FILE_TOO_MANY_OPEN = 33
28
- EDS_ERR_FILE_NOT_FOUND = 34
29
- EDS_ERR_FILE_OPEN_ERROR = 35
30
- EDS_ERR_FILE_CLOSE_ERROR = 36
31
- EDS_ERR_FILE_SEEK_ERROR = 37
32
- EDS_ERR_FILE_TELL_ERROR = 38
33
- EDS_ERR_FILE_READ_ERROR = 39
34
- EDS_ERR_FILE_WRITE_ERROR = 40
35
- EDS_ERR_FILE_PERMISSION_ERROR = 41
36
- EDS_ERR_FILE_DISK_FULL_ERROR = 42
37
- EDS_ERR_FILE_ALREADY_EXISTS = 43
38
- EDS_ERR_FILE_FORMAT_UNRECOGNIZED = 44
39
- EDS_ERR_FILE_DATA_CORRUPT = 45
40
- EDS_ERR_FILE_NAMING_NA = 46
26
+ @@EDS_ERR_FILE_IO_ERROR = 32
27
+ @@EDS_ERR_FILE_TOO_MANY_OPEN = 33
28
+ @@EDS_ERR_FILE_NOT_FOUND = 34
29
+ @@EDS_ERR_FILE_OPEN_ERROR = 35
30
+ @@EDS_ERR_FILE_CLOSE_ERROR = 36
31
+ @@EDS_ERR_FILE_SEEK_ERROR = 37
32
+ @@EDS_ERR_FILE_TELL_ERROR = 38
33
+ @@EDS_ERR_FILE_READ_ERROR = 39
34
+ @@EDS_ERR_FILE_WRITE_ERROR = 40
35
+ @@EDS_ERR_FILE_PERMISSION_ERROR = 41
36
+ @@EDS_ERR_FILE_DISK_FULL_ERROR = 42
37
+ @@EDS_ERR_FILE_ALREADY_EXISTS = 43
38
+ @@EDS_ERR_FILE_FORMAT_UNRECOGNIZED = 44
39
+ @@EDS_ERR_FILE_DATA_CORRUPT = 45
40
+ @@EDS_ERR_FILE_NAMING_NA = 46
41
41
  # Directory errors
42
- EDS_ERR_DIR_NOT_FOUND = 64
43
- EDS_ERR_DIR_IO_ERROR = 65
44
- EDS_ERR_DIR_ENTRY_NOT_FOUND = 66
45
- EDS_ERR_DIR_ENTRY_EXISTS = 67
46
- EDS_ERR_DIR_NOT_EMPTY = 68
42
+ @@EDS_ERR_DIR_NOT_FOUND = 64
43
+ @@EDS_ERR_DIR_IO_ERROR = 65
44
+ @@EDS_ERR_DIR_ENTRY_NOT_FOUND = 66
45
+ @@EDS_ERR_DIR_ENTRY_EXISTS = 67
46
+ @@EDS_ERR_DIR_NOT_EMPTY = 68
47
47
  # Property errors
48
- EDS_ERR_PROPERTIES_UNAVAILABLE = 80
49
- EDS_ERR_PROPERTIES_MISMATCH = 81
50
- EDS_ERR_PROPERTIES_NOT_LOADED = 83
48
+ @@EDS_ERR_PROPERTIES_UNAVAILABLE = 80
49
+ @@EDS_ERR_PROPERTIES_MISMATCH = 81
50
+ @@EDS_ERR_PROPERTIES_NOT_LOADED = 83
51
51
  # Function Parameter errors
52
- EDS_ERR_INVALID_PARAMETER = 96
53
- EDS_ERR_INVALID_HANDLE = 97
54
- EDS_ERR_INVALID_POINTER = 98
55
- EDS_ERR_INVALID_INDEX = 99
56
- EDS_ERR_INVALID_LENGTH = 100
57
- EDS_ERR_INVALID_FN_POINTER = 101
58
- EDS_ERR_INVALID_SORT_FN = 102
52
+ @@EDS_ERR_INVALID_PARAMETER = 96
53
+ @@EDS_ERR_INVALID_HANDLE = 97
54
+ @@EDS_ERR_INVALID_POINTER = 98
55
+ @@EDS_ERR_INVALID_INDEX = 99
56
+ @@EDS_ERR_INVALID_LENGTH = 100
57
+ @@EDS_ERR_INVALID_FN_POINTER = 101
58
+ @@EDS_ERR_INVALID_SORT_FN = 102
59
59
  # Device errors
60
- EDS_ERR_DEVICE_NOT_FOUND = 128
61
- EDS_ERR_DEVICE_BUSY = 129
62
- EDS_ERR_DEVICE_INVALID = 130
63
- EDS_ERR_DEVICE_EMERGENCY = 131
64
- EDS_ERR_DEVICE_MEMORY_FULL = 132
65
- EDS_ERR_DEVICE_INTERNAL_ERROR = 133
66
- EDS_ERR_DEVICE_INVALID_PARAMETER = 134
67
- EDS_ERR_DEVICE_NO_DISK = 135
68
- EDS_ERR_DEVICE_DISK_ERROR = 136
69
- EDS_ERR_DEVICE_CF_GATE_CHANGED = 137
70
- EDS_ERR_DEVICE_DIAL_CHANGED = 138
71
- EDS_ERR_DEVICE_NOT_INSTALLED = 139
72
- EDS_ERR_DEVICE_STAY_AWAKE = 140
73
- EDS_ERR_DEVICE_NOT_RELEASED = 141
60
+ @@EDS_ERR_DEVICE_NOT_FOUND = 128
61
+ @@EDS_ERR_DEVICE_BUSY = 129
62
+ @@EDS_ERR_DEVICE_INVALID = 130
63
+ @@EDS_ERR_DEVICE_EMERGENCY = 131
64
+ @@EDS_ERR_DEVICE_MEMORY_FULL = 132
65
+ @@EDS_ERR_DEVICE_INTERNAL_ERROR = 133
66
+ @@EDS_ERR_DEVICE_INVALID_PARAMETER = 134
67
+ @@EDS_ERR_DEVICE_NO_DISK = 135
68
+ @@EDS_ERR_DEVICE_DISK_ERROR = 136
69
+ @@EDS_ERR_DEVICE_CF_GATE_CHANGED = 137
70
+ @@EDS_ERR_DEVICE_DIAL_CHANGED = 138
71
+ @@EDS_ERR_DEVICE_NOT_INSTALLED = 139
72
+ @@EDS_ERR_DEVICE_STAY_AWAKE = 140
73
+ @@EDS_ERR_DEVICE_NOT_RELEASED = 141
74
74
  # Stream errors
75
- EDS_ERR_STREAM_IO_ERROR = 160
76
- EDS_ERR_STREAM_NOT_OPEN = 161
77
- EDS_ERR_STREAM_ALREADY_OPEN = 162
78
- EDS_ERR_STREAM_OPEN_ERROR = 163
79
- EDS_ERR_STREAM_CLOSE_ERROR = 164
80
- EDS_ERR_STREAM_SEEK_ERROR = 165
81
- EDS_ERR_STREAM_TELL_ERROR = 166
82
- EDS_ERR_STREAM_READ_ERROR = 167
83
- EDS_ERR_STREAM_WRITE_ERROR = 168
84
- EDS_ERR_STREAM_PERMISSION_ERROR = 169
85
- EDS_ERR_STREAM_COULDNT_BEGIN_THREAD = 170
86
- EDS_ERR_STREAM_BAD_OPTIONS = 171
87
- EDS_ERR_STREAM_END_OF_STREAM = 172
75
+ @@EDS_ERR_STREAM_IO_ERROR = 160
76
+ @@EDS_ERR_STREAM_NOT_OPEN = 161
77
+ @@EDS_ERR_STREAM_ALREADY_OPEN = 162
78
+ @@EDS_ERR_STREAM_OPEN_ERROR = 163
79
+ @@EDS_ERR_STREAM_CLOSE_ERROR = 164
80
+ @@EDS_ERR_STREAM_SEEK_ERROR = 165
81
+ @@EDS_ERR_STREAM_TELL_ERROR = 166
82
+ @@EDS_ERR_STREAM_READ_ERROR = 167
83
+ @@EDS_ERR_STREAM_WRITE_ERROR = 168
84
+ @@EDS_ERR_STREAM_PERMISSION_ERROR = 169
85
+ @@EDS_ERR_STREAM_COULDNT_BEGIN_THREAD = 170
86
+ @@EDS_ERR_STREAM_BAD_OPTIONS = 171
87
+ @@EDS_ERR_STREAM_END_OF_STREAM = 172
88
88
  # Communications errors
89
- EDS_ERR_COMM_PORT_IS_IN_USE = 192
90
- EDS_ERR_COMM_DISCONNECTED = 193
91
- EDS_ERR_COMM_DEVICE_INCOMPATIBLE = 194
92
- EDS_ERR_COMM_BUFFER_FULL = 195
93
- EDS_ERR_COMM_USB_BUS_ERR = 196
89
+ @@EDS_ERR_COMM_PORT_IS_IN_USE = 192
90
+ @@EDS_ERR_COMM_DISCONNECTED = 193
91
+ @@EDS_ERR_COMM_DEVICE_INCOMPATIBLE = 194
92
+ @@EDS_ERR_COMM_BUFFER_FULL = 195
93
+ @@EDS_ERR_COMM_USB_BUS_ERR = 196
94
94
  # Lock/Unlock
95
- EDS_ERR_USB_DEVICE_LOCK_ERROR = 208
96
- EDS_ERR_USB_DEVICE_UNLOCK_ERROR = 209
95
+ @@EDS_ERR_USB_DEVICE_LOCK_ERROR = 208
96
+ @@EDS_ERR_USB_DEVICE_UNLOCK_ERROR = 209
97
97
  # STI/WIA
98
- EDS_ERR_STI_UNKNOWN_ERROR = 224
99
- EDS_ERR_STI_INTERNAL_ERROR = 225
100
- EDS_ERR_STI_DEVICE_CREATE_ERROR = 226
101
- EDS_ERR_STI_DEVICE_RELEASE_ERROR = 227
102
- EDS_ERR_DEVICE_NOT_LAUNCHED = 228
103
- EDS_ERR_ENUM_NA = 240
104
- EDS_ERR_INVALID_FN_CALL = 241
105
- EDS_ERR_HANDLE_NOT_FOUND = 242
106
- EDS_ERR_INVALID_ID = 243
107
- EDS_ERR_WAIT_TIMEOUT_ERROR = 244
98
+ @@EDS_ERR_STI_UNKNOWN_ERROR = 224
99
+ @@EDS_ERR_STI_INTERNAL_ERROR = 225
100
+ @@EDS_ERR_STI_DEVICE_CREATE_ERROR = 226
101
+ @@EDS_ERR_STI_DEVICE_RELEASE_ERROR = 227
102
+ @@EDS_ERR_DEVICE_NOT_LAUNCHED = 228
103
+ @@EDS_ERR_ENUM_NA = 240
104
+ @@EDS_ERR_INVALID_FN_CALL = 241
105
+ @@EDS_ERR_HANDLE_NOT_FOUND = 242
106
+ @@EDS_ERR_INVALID_ID = 243
107
+ @@EDS_ERR_WAIT_TIMEOUT_ERROR = 244
108
108
  # PTP
109
- EDS_ERR_SESSION_NOT_OPEN = 8195
110
- EDS_ERR_INVALID_TRANSACTIONID = 8196
111
- EDS_ERR_INCOMPLETE_TRANSFER = 8199
112
- EDS_ERR_INVALID_STRAGEID = 8200
113
- EDS_ERR_DEVICEPROP_NOT_SUPPORTED = 8202
114
- EDS_ERR_INVALID_OBJECTFORMATCODE = 8203
115
- EDS_ERR_SELF_TEST_FAILED = 8209
116
- EDS_ERR_PARTIAL_DELETION = 8210
117
- EDS_ERR_SPECIFICATION_BY_FORMAT_UNSUPPORTED = 8212
118
- EDS_ERR_NO_VALID_OBJECTINFO = 8213
119
- EDS_ERR_INVALID_CODE_FORMAT = 8214
120
- EDS_ERR_UNKNOWN_VENDOR_CODE = 8215
121
- EDS_ERR_CAPTURE_ALREADY_TERMINATED = 8216
122
- EDS_ERR_INVALID_PARENTOBJECT = 8218
123
- EDS_ERR_INVALID_DEVICEPROP_FORMAT = 8219
124
- EDS_ERR_INVALID_DEVICEPROP_VALUE = 8220
125
- EDS_ERR_SESSION_ALREADY_OPEN = 8222
126
- EDS_ERR_TRANSACTION_CANCELLED = 8223
127
- EDS_ERR_SPECIFICATION_OF_DESTINATION_UNSUPPORTED = 8224
128
- EDS_ERR_NOT_CAMERA_SUPPORT_SDK_VERSION = 8225
109
+ @@EDS_ERR_SESSION_NOT_OPEN = 8195
110
+ @@EDS_ERR_INVALID_TRANSACTIONID = 8196
111
+ @@EDS_ERR_INCOMPLETE_TRANSFER = 8199
112
+ @@EDS_ERR_INVALID_STRAGEID = 8200
113
+ @@EDS_ERR_DEVICEPROP_NOT_SUPPORTED = 8202
114
+ @@EDS_ERR_INVALID_OBJECTFORMATCODE = 8203
115
+ @@EDS_ERR_SELF_TEST_FAILED = 8209
116
+ @@EDS_ERR_PARTIAL_DELETION = 8210
117
+ @@EDS_ERR_SPECIFICATION_BY_FORMAT_UNSUPPORTED = 8212
118
+ @@EDS_ERR_NO_VALID_OBJECTINFO = 8213
119
+ @@EDS_ERR_INVALID_CODE_FORMAT = 8214
120
+ @@EDS_ERR_UNKNOWN_VENDOR_CODE = 8215
121
+ @@EDS_ERR_CAPTURE_ALREADY_TERMINATED = 8216
122
+ @@EDS_ERR_INVALID_PARENTOBJECT = 8218
123
+ @@EDS_ERR_INVALID_DEVICEPROP_FORMAT = 8219
124
+ @@EDS_ERR_INVALID_DEVICEPROP_VALUE = 8220
125
+ @@EDS_ERR_SESSION_ALREADY_OPEN = 8222
126
+ @@EDS_ERR_TRANSACTION_CANCELLED = 8223
127
+ @@EDS_ERR_SPECIFICATION_OF_DESTINATION_UNSUPPORTED = 8224
128
+ @@EDS_ERR_NOT_CAMERA_SUPPORT_SDK_VERSION = 8225
129
129
  # PTP Vendor
130
- EDS_ERR_UNKNOWN_COMMAND = 40961
131
- EDS_ERR_OPERATION_REFUSED = 40965
132
- EDS_ERR_LENS_COVER_CLOSE = 40966
133
- EDS_ERR_LOW_BATTERY = 41217
134
- EDS_ERR_OBJECT_NOTREADY = 41218
135
- EDS_ERR_CANNOT_MAKE_OBJECT = 41220
136
- EDS_ERR_MEMORYSTATUS_NOTREADY = 41222
130
+ @@EDS_ERR_UNKNOWN_COMMAND = 40961
131
+ @@EDS_ERR_OPERATION_REFUSED = 40965
132
+ @@EDS_ERR_LENS_COVER_CLOSE = 40966
133
+ @@EDS_ERR_LOW_BATTERY = 41217
134
+ @@EDS_ERR_OBJECT_NOTREADY = 41218
135
+ @@EDS_ERR_CANNOT_MAKE_OBJECT = 41220
136
+ @@EDS_ERR_MEMORYSTATUS_NOTREADY = 41222
137
137
  # Take Picture errors
138
- EDS_ERR_TAKE_PICTURE_AF_NG = 36097
139
- EDS_ERR_TAKE_PICTURE_RESERVED = 36098
140
- EDS_ERR_TAKE_PICTURE_MIRROR_UP_NG = 36099
141
- EDS_ERR_TAKE_PICTURE_SENSOR_CLEANING_NG = 36100
142
- EDS_ERR_TAKE_PICTURE_SILENCE_NG = 36101
143
- EDS_ERR_TAKE_PICTURE_NO_CARD_NG = 36102
144
- EDS_ERR_TAKE_PICTURE_CARD_NG = 36103
145
- EDS_ERR_TAKE_PICTURE_CARD_PROTECT_NG = 36104
146
- EDS_ERR_TAKE_PICTURE_MOVIE_CROP_NG = 36105
147
- EDS_ERR_TAKE_PICTURE_STROBO_CHARGE_NG = 36106
148
- EDS_ERR_TAKE_PICTURE_NO_LENS_NG = 36107
149
- EDS_ERR_TAKE_PICTURE_SPECIAL_MOVIE_MODE_NG = 36108
150
- EDS_ERR_TAKE_PICTURE_LV_REL_PROHIBIT_MODE_NG = 36109
151
- EDS_ERR_LAST_GENERIC_ERROR_PLUS_ONE = 245
138
+ @@EDS_ERR_TAKE_PICTURE_AF_NG = 36097
139
+ @@EDS_ERR_TAKE_PICTURE_RESERVED = 36098
140
+ @@EDS_ERR_TAKE_PICTURE_MIRROR_UP_NG = 36099
141
+ @@EDS_ERR_TAKE_PICTURE_SENSOR_CLEANING_NG = 36100
142
+ @@EDS_ERR_TAKE_PICTURE_SILENCE_NG = 36101
143
+ @@EDS_ERR_TAKE_PICTURE_NO_CARD_NG = 36102
144
+ @@EDS_ERR_TAKE_PICTURE_CARD_NG = 36103
145
+ @@EDS_ERR_TAKE_PICTURE_CARD_PROTECT_NG = 36104
146
+ @@EDS_ERR_TAKE_PICTURE_MOVIE_CROP_NG = 36105
147
+ @@EDS_ERR_TAKE_PICTURE_STROBO_CHARGE_NG = 36106
148
+ @@EDS_ERR_TAKE_PICTURE_NO_LENS_NG = 36107
149
+ @@EDS_ERR_TAKE_PICTURE_SPECIAL_MOVIE_MODE_NG = 36108
150
+ @@EDS_ERR_TAKE_PICTURE_LV_REL_PROHIBIT_MODE_NG = 36109
151
+ @@EDS_ERR_LAST_GENERIC_ERROR_PLUS_ONE = 245
152
152
  end
data/lib/canonball/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Canonball
2
- VERSION = "1.0.0"
2
+ VERSION = "1.1.0"
3
3
  end
data/src/.DS_Store CHANGED
Binary file
data/src/Makefile CHANGED
@@ -1,2 +1,2 @@
1
1
  canon: canonball.cpp
2
- g++ -dynamiclib canonball.cpp -F . -framework EDSDK -o ../lib/canonball/canonball.so
2
+ g++ -dynamiclib canonball.cpp -F . -framework EDSDK -o ../lib/canonball/canonball.so
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: canonball
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jon Christopher
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-15 00:00:00.000000000 Z
11
+ date: 2014-11-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler