sdl2-bindings 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f73062f9ae50b344eec98926c870dff3e9078e4898e0172468020cc87fc97bd2
4
- data.tar.gz: d34d61266c204dd015c12cef1018151d1a80b4e780a3a24265ef3db8e278459a
3
+ metadata.gz: dacd5afde4d3e9bd4a1deb86c4397d355b430fb678ee2fb82b497d8d949aa597
4
+ data.tar.gz: d007868298f77d9fe6a90419263e93823f5ef96b6e9f8760dd0c3a9a9d440ab6
5
5
  SHA512:
6
- metadata.gz: 7d7e17f197cecec3a5845ef430ed738feef0e3e428e72c8f5dadf39f2b0f0f15e907ad05f1671cf3c5a29be7f046d3848cd7d759f2f1f4d55b3c11e12fd2dff3
7
- data.tar.gz: b955e9d530fa42360195c52b5f80f0c548ad6af30b4eb0f0093d7785856c0fcf07916560f82cfa68d04c58c7c7f3c4c5f6eb699148caf51b5aa71cc90363d1d3
6
+ metadata.gz: b82ed5bfad5cea0fb9fedb993d0ab1606c40f7ecbacf9ff286abe437e6f9d6c0e69bf62ef7c9236f24a444c3f8526e643dbab47a0f5d34f7557b4a29524dac97
7
+ data.tar.gz: 2a0539e7aa91c508617eae7bc2decccb2fd5ca0c746d51422ff9ae399a474f61f5671d30fe4cf08101dfda91475b5eac4274053045540c53fe9a356b9571f534
data/ChangeLog CHANGED
@@ -1,3 +1,8 @@
1
+ 2022-07-31 vaiorabbit <http://twitter.com/vaiorabbit>
2
+
3
+ * Regenerated bindings to fix bugs (size_t interpretation)
4
+ * Regenerated bindings for SDL_image 2.6.0, SDL_mixer 2.6.0 and SDL_ttf 2.20.0
5
+
1
6
  2022-05-01 vaiorabbit <http://twitter.com/vaiorabbit>
2
7
 
3
8
  * lib/sdl2_rwops.rb: Added RW_SEEK_SET, RW_SEEK_CUR and RW_SEEK_END
data/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  # sdl2-bindings : Yet another SDL2 wrapper for Ruby #
4
4
 
5
5
  * Created : 2015-09-19
6
- * Last modified : 2022-05-01
6
+ * Last modified : 2022-07-31
7
7
 
8
8
  ## Features ##
9
9
 
@@ -17,11 +17,11 @@
17
17
 
18
18
  ## Target version ##
19
19
 
20
- * [2022-04-29]
20
+ * [2022-07-31]
21
21
  * SDL : 2.0.22
22
- * SDL_image : 2.0.5
23
- * SDL_mixer : 2.0.4
24
- * SDL_ttf : 2.0.18
22
+ * SDL_image : 2.6.0
23
+ * SDL_mixer : 2.6.0
24
+ * SDL_ttf : 2.20.0
25
25
  * SDL2_gfx : 1.0.4
26
26
  * SDL_sound : 2.0.1
27
27
 
@@ -42,18 +42,26 @@
42
42
  * SDL_ttf : 2.0.18
43
43
  * SDL2_gfx : 1.0.4
44
44
  * SDL_sound : 2.0.1
45
+ * [2022-04-29]
46
+ * SDL : 2.0.22
47
+ * SDL_image : 2.0.5
48
+ * SDL_mixer : 2.0.4
49
+ * SDL_ttf : 2.0.18
50
+ * SDL2_gfx : 1.0.4
51
+ * SDL_sound : 2.0.1
45
52
 
46
53
  </details>
47
54
 
48
55
  ## Supported Environments ##
49
56
 
50
57
  * [2022-04-29] Windows 10 (21H1), ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [x64-mingw-ucrt]
51
- * [2022-01-11] macOS Monterey (12.1), ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [arm64-darwin20]
58
+ * [2022-07-31] macOS Monterey (12.4), ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [arm64-darwin21]
52
59
 
53
60
  <details>
54
61
  <summary>Older Environments</summary>
55
62
 
56
63
  * [2022-02-12] Windows 10 (21H1), ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [x64-mingw-ucrt]
64
+ * [2022-01-11] macOS Monterey (12.1), ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [arm64-darwin20]
57
65
  * [2021-12-02] macOS Big Sur (11.6), ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [arm64-darwin20]
58
66
  * [2021-08-12] macOS Big Sur (11.5), ruby 3.0.1p64 (2021-04-05 revision 0fb782ee38) [arm64-darwin20]
59
67
  * [2020-12-27] macOS Big Sur (11.0.1), ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [arm64-darwin20]
data/lib/sdl2_cpuinfo.rb CHANGED
@@ -89,8 +89,8 @@ module SDL
89
89
  :SDL_HasNEON => [],
90
90
  :SDL_GetSystemRAM => [],
91
91
  :SDL_SIMDGetAlignment => [],
92
- :SDL_SIMDAlloc => [:int],
93
- :SDL_SIMDRealloc => [:pointer, :int],
92
+ :SDL_SIMDAlloc => [:ulong],
93
+ :SDL_SIMDRealloc => [:pointer, :ulong],
94
94
  :SDL_SIMDFree => [:pointer],
95
95
  }
96
96
  retvals = {
@@ -111,7 +111,7 @@ module SDL
111
111
  :SDL_HasARMSIMD => :int,
112
112
  :SDL_HasNEON => :int,
113
113
  :SDL_GetSystemRAM => :int,
114
- :SDL_SIMDGetAlignment => :int,
114
+ :SDL_SIMDGetAlignment => :size_t,
115
115
  :SDL_SIMDAlloc => :pointer,
116
116
  :SDL_SIMDRealloc => :pointer,
117
117
  :SDL_SIMDFree => :void,
data/lib/sdl2_hidapi.rb CHANGED
@@ -92,17 +92,17 @@ module SDL
92
92
  :SDL_hid_free_enumeration => [:pointer],
93
93
  :SDL_hid_open => [:ushort, :ushort, :pointer],
94
94
  :SDL_hid_open_path => [:pointer, :int],
95
- :SDL_hid_write => [:pointer, :pointer, :int],
96
- :SDL_hid_read_timeout => [:pointer, :pointer, :int, :int],
97
- :SDL_hid_read => [:pointer, :pointer, :int],
95
+ :SDL_hid_write => [:pointer, :pointer, :ulong],
96
+ :SDL_hid_read_timeout => [:pointer, :pointer, :ulong, :int],
97
+ :SDL_hid_read => [:pointer, :pointer, :ulong],
98
98
  :SDL_hid_set_nonblocking => [:pointer, :int],
99
- :SDL_hid_send_feature_report => [:pointer, :pointer, :int],
100
- :SDL_hid_get_feature_report => [:pointer, :pointer, :int],
99
+ :SDL_hid_send_feature_report => [:pointer, :pointer, :ulong],
100
+ :SDL_hid_get_feature_report => [:pointer, :pointer, :ulong],
101
101
  :SDL_hid_close => [:pointer],
102
- :SDL_hid_get_manufacturer_string => [:pointer, :pointer, :int],
103
- :SDL_hid_get_product_string => [:pointer, :pointer, :int],
104
- :SDL_hid_get_serial_number_string => [:pointer, :pointer, :int],
105
- :SDL_hid_get_indexed_string => [:pointer, :int, :pointer, :int],
102
+ :SDL_hid_get_manufacturer_string => [:pointer, :pointer, :ulong],
103
+ :SDL_hid_get_product_string => [:pointer, :pointer, :ulong],
104
+ :SDL_hid_get_serial_number_string => [:pointer, :pointer, :ulong],
105
+ :SDL_hid_get_indexed_string => [:pointer, :int, :pointer, :ulong],
106
106
  :SDL_hid_ble_scan => [:int],
107
107
  }
108
108
  retvals = {
data/lib/sdl2_image.rb CHANGED
@@ -11,8 +11,8 @@ module SDL
11
11
  # Define/Macro
12
12
 
13
13
  IMAGE_MAJOR_VERSION = 2
14
- IMAGE_MINOR_VERSION = 0
15
- IMAGE_PATCHLEVEL = 5
14
+ IMAGE_MINOR_VERSION = 6
15
+ IMAGE_PATCHLEVEL = 0
16
16
 
17
17
  # Enum
18
18
 
@@ -20,6 +20,8 @@ module SDL
20
20
  IMG_INIT_PNG = 2
21
21
  IMG_INIT_TIF = 4
22
22
  IMG_INIT_WEBP = 8
23
+ IMG_INIT_JXL = 16
24
+ IMG_INIT_AVIF = 32
23
25
 
24
26
  # Typedef
25
27
 
@@ -27,6 +29,16 @@ module SDL
27
29
 
28
30
  # Struct
29
31
 
32
+ class IMG_Animation < FFI::Struct
33
+ layout(
34
+ :w, :int,
35
+ :h, :int,
36
+ :count, :int,
37
+ :frames, :pointer,
38
+ :delays, :pointer,
39
+ )
40
+ end
41
+
30
42
 
31
43
  # Function
32
44
 
@@ -41,42 +53,55 @@ module SDL
41
53
  :IMG_LoadTexture,
42
54
  :IMG_LoadTexture_RW,
43
55
  :IMG_LoadTextureTyped_RW,
56
+ :IMG_isAVIF,
44
57
  :IMG_isICO,
45
58
  :IMG_isCUR,
46
59
  :IMG_isBMP,
47
60
  :IMG_isGIF,
48
61
  :IMG_isJPG,
62
+ :IMG_isJXL,
49
63
  :IMG_isLBM,
50
64
  :IMG_isPCX,
51
65
  :IMG_isPNG,
52
66
  :IMG_isPNM,
53
67
  :IMG_isSVG,
68
+ :IMG_isQOI,
54
69
  :IMG_isTIF,
55
70
  :IMG_isXCF,
56
71
  :IMG_isXPM,
57
72
  :IMG_isXV,
58
73
  :IMG_isWEBP,
74
+ :IMG_LoadAVIF_RW,
59
75
  :IMG_LoadICO_RW,
60
76
  :IMG_LoadCUR_RW,
61
77
  :IMG_LoadBMP_RW,
62
78
  :IMG_LoadGIF_RW,
63
79
  :IMG_LoadJPG_RW,
80
+ :IMG_LoadJXL_RW,
64
81
  :IMG_LoadLBM_RW,
65
82
  :IMG_LoadPCX_RW,
66
83
  :IMG_LoadPNG_RW,
67
84
  :IMG_LoadPNM_RW,
68
85
  :IMG_LoadSVG_RW,
86
+ :IMG_LoadQOI_RW,
69
87
  :IMG_LoadTGA_RW,
70
88
  :IMG_LoadTIF_RW,
71
89
  :IMG_LoadXCF_RW,
72
90
  :IMG_LoadXPM_RW,
73
91
  :IMG_LoadXV_RW,
74
92
  :IMG_LoadWEBP_RW,
93
+ :IMG_LoadSizedSVG_RW,
75
94
  :IMG_ReadXPMFromArray,
95
+ :IMG_ReadXPMFromArrayToRGB888,
76
96
  :IMG_SavePNG,
77
97
  :IMG_SavePNG_RW,
78
98
  :IMG_SaveJPG,
79
99
  :IMG_SaveJPG_RW,
100
+ :IMG_LoadAnimation,
101
+ :IMG_LoadAnimation_RW,
102
+ :IMG_LoadAnimationTyped_RW,
103
+ :IMG_FreeAnimation,
104
+ :IMG_LoadGIFAnimation_RW,
80
105
  ]
81
106
  apis = {
82
107
  :IMG_Linked_Version => :IMG_Linked_Version,
@@ -88,42 +113,55 @@ module SDL
88
113
  :IMG_LoadTexture => :IMG_LoadTexture,
89
114
  :IMG_LoadTexture_RW => :IMG_LoadTexture_RW,
90
115
  :IMG_LoadTextureTyped_RW => :IMG_LoadTextureTyped_RW,
116
+ :IMG_isAVIF => :IMG_isAVIF,
91
117
  :IMG_isICO => :IMG_isICO,
92
118
  :IMG_isCUR => :IMG_isCUR,
93
119
  :IMG_isBMP => :IMG_isBMP,
94
120
  :IMG_isGIF => :IMG_isGIF,
95
121
  :IMG_isJPG => :IMG_isJPG,
122
+ :IMG_isJXL => :IMG_isJXL,
96
123
  :IMG_isLBM => :IMG_isLBM,
97
124
  :IMG_isPCX => :IMG_isPCX,
98
125
  :IMG_isPNG => :IMG_isPNG,
99
126
  :IMG_isPNM => :IMG_isPNM,
100
127
  :IMG_isSVG => :IMG_isSVG,
128
+ :IMG_isQOI => :IMG_isQOI,
101
129
  :IMG_isTIF => :IMG_isTIF,
102
130
  :IMG_isXCF => :IMG_isXCF,
103
131
  :IMG_isXPM => :IMG_isXPM,
104
132
  :IMG_isXV => :IMG_isXV,
105
133
  :IMG_isWEBP => :IMG_isWEBP,
134
+ :IMG_LoadAVIF_RW => :IMG_LoadAVIF_RW,
106
135
  :IMG_LoadICO_RW => :IMG_LoadICO_RW,
107
136
  :IMG_LoadCUR_RW => :IMG_LoadCUR_RW,
108
137
  :IMG_LoadBMP_RW => :IMG_LoadBMP_RW,
109
138
  :IMG_LoadGIF_RW => :IMG_LoadGIF_RW,
110
139
  :IMG_LoadJPG_RW => :IMG_LoadJPG_RW,
140
+ :IMG_LoadJXL_RW => :IMG_LoadJXL_RW,
111
141
  :IMG_LoadLBM_RW => :IMG_LoadLBM_RW,
112
142
  :IMG_LoadPCX_RW => :IMG_LoadPCX_RW,
113
143
  :IMG_LoadPNG_RW => :IMG_LoadPNG_RW,
114
144
  :IMG_LoadPNM_RW => :IMG_LoadPNM_RW,
115
145
  :IMG_LoadSVG_RW => :IMG_LoadSVG_RW,
146
+ :IMG_LoadQOI_RW => :IMG_LoadQOI_RW,
116
147
  :IMG_LoadTGA_RW => :IMG_LoadTGA_RW,
117
148
  :IMG_LoadTIF_RW => :IMG_LoadTIF_RW,
118
149
  :IMG_LoadXCF_RW => :IMG_LoadXCF_RW,
119
150
  :IMG_LoadXPM_RW => :IMG_LoadXPM_RW,
120
151
  :IMG_LoadXV_RW => :IMG_LoadXV_RW,
121
152
  :IMG_LoadWEBP_RW => :IMG_LoadWEBP_RW,
153
+ :IMG_LoadSizedSVG_RW => :IMG_LoadSizedSVG_RW,
122
154
  :IMG_ReadXPMFromArray => :IMG_ReadXPMFromArray,
155
+ :IMG_ReadXPMFromArrayToRGB888 => :IMG_ReadXPMFromArrayToRGB888,
123
156
  :IMG_SavePNG => :IMG_SavePNG,
124
157
  :IMG_SavePNG_RW => :IMG_SavePNG_RW,
125
158
  :IMG_SaveJPG => :IMG_SaveJPG,
126
159
  :IMG_SaveJPG_RW => :IMG_SaveJPG_RW,
160
+ :IMG_LoadAnimation => :IMG_LoadAnimation,
161
+ :IMG_LoadAnimation_RW => :IMG_LoadAnimation_RW,
162
+ :IMG_LoadAnimationTyped_RW => :IMG_LoadAnimationTyped_RW,
163
+ :IMG_FreeAnimation => :IMG_FreeAnimation,
164
+ :IMG_LoadGIFAnimation_RW => :IMG_LoadGIFAnimation_RW,
127
165
  }
128
166
  args = {
129
167
  :IMG_Linked_Version => [],
@@ -135,42 +173,55 @@ module SDL
135
173
  :IMG_LoadTexture => [:pointer, :pointer],
136
174
  :IMG_LoadTexture_RW => [:pointer, :pointer, :int],
137
175
  :IMG_LoadTextureTyped_RW => [:pointer, :pointer, :int, :pointer],
176
+ :IMG_isAVIF => [:pointer],
138
177
  :IMG_isICO => [:pointer],
139
178
  :IMG_isCUR => [:pointer],
140
179
  :IMG_isBMP => [:pointer],
141
180
  :IMG_isGIF => [:pointer],
142
181
  :IMG_isJPG => [:pointer],
182
+ :IMG_isJXL => [:pointer],
143
183
  :IMG_isLBM => [:pointer],
144
184
  :IMG_isPCX => [:pointer],
145
185
  :IMG_isPNG => [:pointer],
146
186
  :IMG_isPNM => [:pointer],
147
187
  :IMG_isSVG => [:pointer],
188
+ :IMG_isQOI => [:pointer],
148
189
  :IMG_isTIF => [:pointer],
149
190
  :IMG_isXCF => [:pointer],
150
191
  :IMG_isXPM => [:pointer],
151
192
  :IMG_isXV => [:pointer],
152
193
  :IMG_isWEBP => [:pointer],
194
+ :IMG_LoadAVIF_RW => [:pointer],
153
195
  :IMG_LoadICO_RW => [:pointer],
154
196
  :IMG_LoadCUR_RW => [:pointer],
155
197
  :IMG_LoadBMP_RW => [:pointer],
156
198
  :IMG_LoadGIF_RW => [:pointer],
157
199
  :IMG_LoadJPG_RW => [:pointer],
200
+ :IMG_LoadJXL_RW => [:pointer],
158
201
  :IMG_LoadLBM_RW => [:pointer],
159
202
  :IMG_LoadPCX_RW => [:pointer],
160
203
  :IMG_LoadPNG_RW => [:pointer],
161
204
  :IMG_LoadPNM_RW => [:pointer],
162
205
  :IMG_LoadSVG_RW => [:pointer],
206
+ :IMG_LoadQOI_RW => [:pointer],
163
207
  :IMG_LoadTGA_RW => [:pointer],
164
208
  :IMG_LoadTIF_RW => [:pointer],
165
209
  :IMG_LoadXCF_RW => [:pointer],
166
210
  :IMG_LoadXPM_RW => [:pointer],
167
211
  :IMG_LoadXV_RW => [:pointer],
168
212
  :IMG_LoadWEBP_RW => [:pointer],
213
+ :IMG_LoadSizedSVG_RW => [:pointer, :int, :int],
169
214
  :IMG_ReadXPMFromArray => [:pointer],
215
+ :IMG_ReadXPMFromArrayToRGB888 => [:pointer],
170
216
  :IMG_SavePNG => [:pointer, :pointer],
171
217
  :IMG_SavePNG_RW => [:pointer, :pointer, :int],
172
218
  :IMG_SaveJPG => [:pointer, :pointer, :int],
173
219
  :IMG_SaveJPG_RW => [:pointer, :pointer, :int, :int],
220
+ :IMG_LoadAnimation => [:pointer],
221
+ :IMG_LoadAnimation_RW => [:pointer, :int],
222
+ :IMG_LoadAnimationTyped_RW => [:pointer, :int, :pointer],
223
+ :IMG_FreeAnimation => [:pointer],
224
+ :IMG_LoadGIFAnimation_RW => [:pointer],
174
225
  }
175
226
  retvals = {
176
227
  :IMG_Linked_Version => :pointer,
@@ -182,42 +233,55 @@ module SDL
182
233
  :IMG_LoadTexture => :pointer,
183
234
  :IMG_LoadTexture_RW => :pointer,
184
235
  :IMG_LoadTextureTyped_RW => :pointer,
236
+ :IMG_isAVIF => :int,
185
237
  :IMG_isICO => :int,
186
238
  :IMG_isCUR => :int,
187
239
  :IMG_isBMP => :int,
188
240
  :IMG_isGIF => :int,
189
241
  :IMG_isJPG => :int,
242
+ :IMG_isJXL => :int,
190
243
  :IMG_isLBM => :int,
191
244
  :IMG_isPCX => :int,
192
245
  :IMG_isPNG => :int,
193
246
  :IMG_isPNM => :int,
194
247
  :IMG_isSVG => :int,
248
+ :IMG_isQOI => :int,
195
249
  :IMG_isTIF => :int,
196
250
  :IMG_isXCF => :int,
197
251
  :IMG_isXPM => :int,
198
252
  :IMG_isXV => :int,
199
253
  :IMG_isWEBP => :int,
254
+ :IMG_LoadAVIF_RW => :pointer,
200
255
  :IMG_LoadICO_RW => :pointer,
201
256
  :IMG_LoadCUR_RW => :pointer,
202
257
  :IMG_LoadBMP_RW => :pointer,
203
258
  :IMG_LoadGIF_RW => :pointer,
204
259
  :IMG_LoadJPG_RW => :pointer,
260
+ :IMG_LoadJXL_RW => :pointer,
205
261
  :IMG_LoadLBM_RW => :pointer,
206
262
  :IMG_LoadPCX_RW => :pointer,
207
263
  :IMG_LoadPNG_RW => :pointer,
208
264
  :IMG_LoadPNM_RW => :pointer,
209
265
  :IMG_LoadSVG_RW => :pointer,
266
+ :IMG_LoadQOI_RW => :pointer,
210
267
  :IMG_LoadTGA_RW => :pointer,
211
268
  :IMG_LoadTIF_RW => :pointer,
212
269
  :IMG_LoadXCF_RW => :pointer,
213
270
  :IMG_LoadXPM_RW => :pointer,
214
271
  :IMG_LoadXV_RW => :pointer,
215
272
  :IMG_LoadWEBP_RW => :pointer,
273
+ :IMG_LoadSizedSVG_RW => :pointer,
216
274
  :IMG_ReadXPMFromArray => :pointer,
275
+ :IMG_ReadXPMFromArrayToRGB888 => :pointer,
217
276
  :IMG_SavePNG => :int,
218
277
  :IMG_SavePNG_RW => :int,
219
278
  :IMG_SaveJPG => :int,
220
279
  :IMG_SaveJPG_RW => :int,
280
+ :IMG_LoadAnimation => :pointer,
281
+ :IMG_LoadAnimation_RW => :pointer,
282
+ :IMG_LoadAnimationTyped_RW => :pointer,
283
+ :IMG_FreeAnimation => :void,
284
+ :IMG_LoadGIFAnimation_RW => :pointer,
221
285
  }
222
286
  symbols.each do |sym|
223
287
  begin
data/lib/sdl2_mixer.rb CHANGED
@@ -11,10 +11,10 @@ module SDL
11
11
  # Define/Macro
12
12
 
13
13
  MIXER_MAJOR_VERSION = 2
14
- MIXER_MINOR_VERSION = 0
15
- MIXER_PATCHLEVEL = 4
14
+ MIXER_MINOR_VERSION = 6
15
+ MIXER_PATCHLEVEL = 0
16
16
  MIX_CHANNELS = 8
17
- MIX_DEFAULT_FREQUENCY = 22050
17
+ MIX_DEFAULT_FREQUENCY = 44100
18
18
  MIX_DEFAULT_FORMAT = AUDIO_S16LSB
19
19
  MIX_DEFAULT_CHANNELS = 2
20
20
  MIX_MAX_VOLUME = MIX_MAXVOLUME
@@ -73,9 +73,10 @@ module SDL
73
73
  :Mix_Quit,
74
74
  :Mix_OpenAudio,
75
75
  :Mix_OpenAudioDevice,
76
- :Mix_AllocateChannels,
77
76
  :Mix_QuerySpec,
77
+ :Mix_AllocateChannels,
78
78
  :Mix_LoadWAV_RW,
79
+ :Mix_LoadWAV,
79
80
  :Mix_LoadMUS,
80
81
  :Mix_LoadMUS_RW,
81
82
  :Mix_LoadMUSType_RW,
@@ -90,6 +91,11 @@ module SDL
90
91
  :Mix_GetMusicDecoder,
91
92
  :Mix_HasMusicDecoder,
92
93
  :Mix_GetMusicType,
94
+ :Mix_GetMusicTitle,
95
+ :Mix_GetMusicTitleTag,
96
+ :Mix_GetMusicArtistTag,
97
+ :Mix_GetMusicAlbumTag,
98
+ :Mix_GetMusicCopyrightTag,
93
99
  :Mix_SetPostMix,
94
100
  :Mix_HookMusic,
95
101
  :Mix_HookMusicFinished,
@@ -109,14 +115,18 @@ module SDL
109
115
  :Mix_GroupCount,
110
116
  :Mix_GroupOldest,
111
117
  :Mix_GroupNewer,
118
+ :Mix_PlayChannel,
112
119
  :Mix_PlayChannelTimed,
113
120
  :Mix_PlayMusic,
114
121
  :Mix_FadeInMusic,
115
122
  :Mix_FadeInMusicPos,
123
+ :Mix_FadeInChannel,
116
124
  :Mix_FadeInChannelTimed,
117
125
  :Mix_Volume,
118
126
  :Mix_VolumeChunk,
119
127
  :Mix_VolumeMusic,
128
+ :Mix_GetMusicVolume,
129
+ :Mix_MasterVolume,
120
130
  :Mix_HaltChannel,
121
131
  :Mix_HaltGroup,
122
132
  :Mix_HaltMusic,
@@ -133,7 +143,13 @@ module SDL
133
143
  :Mix_ResumeMusic,
134
144
  :Mix_RewindMusic,
135
145
  :Mix_PausedMusic,
146
+ :Mix_ModMusicJumpToOrder,
136
147
  :Mix_SetMusicPosition,
148
+ :Mix_GetMusicPosition,
149
+ :Mix_MusicDuration,
150
+ :Mix_GetMusicLoopStartTime,
151
+ :Mix_GetMusicLoopEndTime,
152
+ :Mix_GetMusicLoopLengthTime,
137
153
  :Mix_Playing,
138
154
  :Mix_PlayingMusic,
139
155
  :Mix_SetMusicCMD,
@@ -142,6 +158,8 @@ module SDL
142
158
  :Mix_SetSoundFonts,
143
159
  :Mix_GetSoundFonts,
144
160
  :Mix_EachSoundFont,
161
+ :Mix_SetTimidityCfg,
162
+ :Mix_GetTimidityCfg,
145
163
  :Mix_GetChunk,
146
164
  :Mix_CloseAudio,
147
165
  ]
@@ -151,9 +169,10 @@ module SDL
151
169
  :Mix_Quit => :Mix_Quit,
152
170
  :Mix_OpenAudio => :Mix_OpenAudio,
153
171
  :Mix_OpenAudioDevice => :Mix_OpenAudioDevice,
154
- :Mix_AllocateChannels => :Mix_AllocateChannels,
155
172
  :Mix_QuerySpec => :Mix_QuerySpec,
173
+ :Mix_AllocateChannels => :Mix_AllocateChannels,
156
174
  :Mix_LoadWAV_RW => :Mix_LoadWAV_RW,
175
+ :Mix_LoadWAV => :Mix_LoadWAV,
157
176
  :Mix_LoadMUS => :Mix_LoadMUS,
158
177
  :Mix_LoadMUS_RW => :Mix_LoadMUS_RW,
159
178
  :Mix_LoadMUSType_RW => :Mix_LoadMUSType_RW,
@@ -168,6 +187,11 @@ module SDL
168
187
  :Mix_GetMusicDecoder => :Mix_GetMusicDecoder,
169
188
  :Mix_HasMusicDecoder => :Mix_HasMusicDecoder,
170
189
  :Mix_GetMusicType => :Mix_GetMusicType,
190
+ :Mix_GetMusicTitle => :Mix_GetMusicTitle,
191
+ :Mix_GetMusicTitleTag => :Mix_GetMusicTitleTag,
192
+ :Mix_GetMusicArtistTag => :Mix_GetMusicArtistTag,
193
+ :Mix_GetMusicAlbumTag => :Mix_GetMusicAlbumTag,
194
+ :Mix_GetMusicCopyrightTag => :Mix_GetMusicCopyrightTag,
171
195
  :Mix_SetPostMix => :Mix_SetPostMix,
172
196
  :Mix_HookMusic => :Mix_HookMusic,
173
197
  :Mix_HookMusicFinished => :Mix_HookMusicFinished,
@@ -187,14 +211,18 @@ module SDL
187
211
  :Mix_GroupCount => :Mix_GroupCount,
188
212
  :Mix_GroupOldest => :Mix_GroupOldest,
189
213
  :Mix_GroupNewer => :Mix_GroupNewer,
214
+ :Mix_PlayChannel => :Mix_PlayChannel,
190
215
  :Mix_PlayChannelTimed => :Mix_PlayChannelTimed,
191
216
  :Mix_PlayMusic => :Mix_PlayMusic,
192
217
  :Mix_FadeInMusic => :Mix_FadeInMusic,
193
218
  :Mix_FadeInMusicPos => :Mix_FadeInMusicPos,
219
+ :Mix_FadeInChannel => :Mix_FadeInChannel,
194
220
  :Mix_FadeInChannelTimed => :Mix_FadeInChannelTimed,
195
221
  :Mix_Volume => :Mix_Volume,
196
222
  :Mix_VolumeChunk => :Mix_VolumeChunk,
197
223
  :Mix_VolumeMusic => :Mix_VolumeMusic,
224
+ :Mix_GetMusicVolume => :Mix_GetMusicVolume,
225
+ :Mix_MasterVolume => :Mix_MasterVolume,
198
226
  :Mix_HaltChannel => :Mix_HaltChannel,
199
227
  :Mix_HaltGroup => :Mix_HaltGroup,
200
228
  :Mix_HaltMusic => :Mix_HaltMusic,
@@ -211,7 +239,13 @@ module SDL
211
239
  :Mix_ResumeMusic => :Mix_ResumeMusic,
212
240
  :Mix_RewindMusic => :Mix_RewindMusic,
213
241
  :Mix_PausedMusic => :Mix_PausedMusic,
242
+ :Mix_ModMusicJumpToOrder => :Mix_ModMusicJumpToOrder,
214
243
  :Mix_SetMusicPosition => :Mix_SetMusicPosition,
244
+ :Mix_GetMusicPosition => :Mix_GetMusicPosition,
245
+ :Mix_MusicDuration => :Mix_MusicDuration,
246
+ :Mix_GetMusicLoopStartTime => :Mix_GetMusicLoopStartTime,
247
+ :Mix_GetMusicLoopEndTime => :Mix_GetMusicLoopEndTime,
248
+ :Mix_GetMusicLoopLengthTime => :Mix_GetMusicLoopLengthTime,
215
249
  :Mix_Playing => :Mix_Playing,
216
250
  :Mix_PlayingMusic => :Mix_PlayingMusic,
217
251
  :Mix_SetMusicCMD => :Mix_SetMusicCMD,
@@ -220,6 +254,8 @@ module SDL
220
254
  :Mix_SetSoundFonts => :Mix_SetSoundFonts,
221
255
  :Mix_GetSoundFonts => :Mix_GetSoundFonts,
222
256
  :Mix_EachSoundFont => :Mix_EachSoundFont,
257
+ :Mix_SetTimidityCfg => :Mix_SetTimidityCfg,
258
+ :Mix_GetTimidityCfg => :Mix_GetTimidityCfg,
223
259
  :Mix_GetChunk => :Mix_GetChunk,
224
260
  :Mix_CloseAudio => :Mix_CloseAudio,
225
261
  }
@@ -229,9 +265,10 @@ module SDL
229
265
  :Mix_Quit => [],
230
266
  :Mix_OpenAudio => [:int, :ushort, :int, :int],
231
267
  :Mix_OpenAudioDevice => [:int, :ushort, :int, :int, :pointer, :int],
232
- :Mix_AllocateChannels => [:int],
233
268
  :Mix_QuerySpec => [:pointer, :pointer, :pointer],
269
+ :Mix_AllocateChannels => [:int],
234
270
  :Mix_LoadWAV_RW => [:pointer, :int],
271
+ :Mix_LoadWAV => [:pointer],
235
272
  :Mix_LoadMUS => [:pointer],
236
273
  :Mix_LoadMUS_RW => [:pointer, :int],
237
274
  :Mix_LoadMUSType_RW => [:pointer, :int, :int],
@@ -246,6 +283,11 @@ module SDL
246
283
  :Mix_GetMusicDecoder => [:int],
247
284
  :Mix_HasMusicDecoder => [:pointer],
248
285
  :Mix_GetMusicType => [:pointer],
286
+ :Mix_GetMusicTitle => [:pointer],
287
+ :Mix_GetMusicTitleTag => [:pointer],
288
+ :Mix_GetMusicArtistTag => [:pointer],
289
+ :Mix_GetMusicAlbumTag => [:pointer],
290
+ :Mix_GetMusicCopyrightTag => [:pointer],
249
291
  :Mix_SetPostMix => [:pointer, :pointer],
250
292
  :Mix_HookMusic => [:pointer, :pointer],
251
293
  :Mix_HookMusicFinished => [:pointer],
@@ -265,14 +307,18 @@ module SDL
265
307
  :Mix_GroupCount => [:int],
266
308
  :Mix_GroupOldest => [:int],
267
309
  :Mix_GroupNewer => [:int],
310
+ :Mix_PlayChannel => [:int, :pointer, :int],
268
311
  :Mix_PlayChannelTimed => [:int, :pointer, :int, :int],
269
312
  :Mix_PlayMusic => [:pointer, :int],
270
313
  :Mix_FadeInMusic => [:pointer, :int, :int],
271
314
  :Mix_FadeInMusicPos => [:pointer, :int, :int, :double],
315
+ :Mix_FadeInChannel => [:int, :pointer, :int, :int],
272
316
  :Mix_FadeInChannelTimed => [:int, :pointer, :int, :int, :int],
273
317
  :Mix_Volume => [:int, :int],
274
318
  :Mix_VolumeChunk => [:pointer, :int],
275
319
  :Mix_VolumeMusic => [:int],
320
+ :Mix_GetMusicVolume => [:pointer],
321
+ :Mix_MasterVolume => [:int],
276
322
  :Mix_HaltChannel => [:int],
277
323
  :Mix_HaltGroup => [:int],
278
324
  :Mix_HaltMusic => [],
@@ -289,7 +335,13 @@ module SDL
289
335
  :Mix_ResumeMusic => [],
290
336
  :Mix_RewindMusic => [],
291
337
  :Mix_PausedMusic => [],
338
+ :Mix_ModMusicJumpToOrder => [:int],
292
339
  :Mix_SetMusicPosition => [:double],
340
+ :Mix_GetMusicPosition => [:pointer],
341
+ :Mix_MusicDuration => [:pointer],
342
+ :Mix_GetMusicLoopStartTime => [:pointer],
343
+ :Mix_GetMusicLoopEndTime => [:pointer],
344
+ :Mix_GetMusicLoopLengthTime => [:pointer],
293
345
  :Mix_Playing => [:int],
294
346
  :Mix_PlayingMusic => [],
295
347
  :Mix_SetMusicCMD => [:pointer],
@@ -298,6 +350,8 @@ module SDL
298
350
  :Mix_SetSoundFonts => [:pointer],
299
351
  :Mix_GetSoundFonts => [],
300
352
  :Mix_EachSoundFont => [:pointer, :pointer],
353
+ :Mix_SetTimidityCfg => [:pointer],
354
+ :Mix_GetTimidityCfg => [],
301
355
  :Mix_GetChunk => [:int],
302
356
  :Mix_CloseAudio => [],
303
357
  }
@@ -307,9 +361,10 @@ module SDL
307
361
  :Mix_Quit => :void,
308
362
  :Mix_OpenAudio => :int,
309
363
  :Mix_OpenAudioDevice => :int,
310
- :Mix_AllocateChannels => :int,
311
364
  :Mix_QuerySpec => :int,
365
+ :Mix_AllocateChannels => :int,
312
366
  :Mix_LoadWAV_RW => :pointer,
367
+ :Mix_LoadWAV => :pointer,
313
368
  :Mix_LoadMUS => :pointer,
314
369
  :Mix_LoadMUS_RW => :pointer,
315
370
  :Mix_LoadMUSType_RW => :pointer,
@@ -324,6 +379,11 @@ module SDL
324
379
  :Mix_GetMusicDecoder => :pointer,
325
380
  :Mix_HasMusicDecoder => :int,
326
381
  :Mix_GetMusicType => :int,
382
+ :Mix_GetMusicTitle => :pointer,
383
+ :Mix_GetMusicTitleTag => :pointer,
384
+ :Mix_GetMusicArtistTag => :pointer,
385
+ :Mix_GetMusicAlbumTag => :pointer,
386
+ :Mix_GetMusicCopyrightTag => :pointer,
327
387
  :Mix_SetPostMix => :void,
328
388
  :Mix_HookMusic => :void,
329
389
  :Mix_HookMusicFinished => :void,
@@ -343,14 +403,18 @@ module SDL
343
403
  :Mix_GroupCount => :int,
344
404
  :Mix_GroupOldest => :int,
345
405
  :Mix_GroupNewer => :int,
406
+ :Mix_PlayChannel => :int,
346
407
  :Mix_PlayChannelTimed => :int,
347
408
  :Mix_PlayMusic => :int,
348
409
  :Mix_FadeInMusic => :int,
349
410
  :Mix_FadeInMusicPos => :int,
411
+ :Mix_FadeInChannel => :int,
350
412
  :Mix_FadeInChannelTimed => :int,
351
413
  :Mix_Volume => :int,
352
414
  :Mix_VolumeChunk => :int,
353
415
  :Mix_VolumeMusic => :int,
416
+ :Mix_GetMusicVolume => :int,
417
+ :Mix_MasterVolume => :int,
354
418
  :Mix_HaltChannel => :int,
355
419
  :Mix_HaltGroup => :int,
356
420
  :Mix_HaltMusic => :int,
@@ -367,7 +431,13 @@ module SDL
367
431
  :Mix_ResumeMusic => :void,
368
432
  :Mix_RewindMusic => :void,
369
433
  :Mix_PausedMusic => :int,
434
+ :Mix_ModMusicJumpToOrder => :int,
370
435
  :Mix_SetMusicPosition => :int,
436
+ :Mix_GetMusicPosition => :double,
437
+ :Mix_MusicDuration => :double,
438
+ :Mix_GetMusicLoopStartTime => :double,
439
+ :Mix_GetMusicLoopEndTime => :double,
440
+ :Mix_GetMusicLoopLengthTime => :double,
371
441
  :Mix_Playing => :int,
372
442
  :Mix_PlayingMusic => :int,
373
443
  :Mix_SetMusicCMD => :int,
@@ -376,6 +446,8 @@ module SDL
376
446
  :Mix_SetSoundFonts => :int,
377
447
  :Mix_GetSoundFonts => :pointer,
378
448
  :Mix_EachSoundFont => :int,
449
+ :Mix_SetTimidityCfg => :int,
450
+ :Mix_GetTimidityCfg => :pointer,
379
451
  :Mix_GetChunk => :pointer,
380
452
  :Mix_CloseAudio => :void,
381
453
  }
data/lib/sdl2_rwops.rb CHANGED
@@ -179,8 +179,8 @@ module SDL
179
179
  :SDL_RWsize => [:pointer],
180
180
  :SDL_RWseek => [:pointer, :long_long, :int],
181
181
  :SDL_RWtell => [:pointer],
182
- :SDL_RWread => [:pointer, :pointer, :int, :int],
183
- :SDL_RWwrite => [:pointer, :pointer, :int, :int],
182
+ :SDL_RWread => [:pointer, :pointer, :ulong, :ulong],
183
+ :SDL_RWwrite => [:pointer, :pointer, :ulong, :ulong],
184
184
  :SDL_RWclose => [:pointer],
185
185
  :SDL_LoadFile_RW => [:pointer, :pointer, :int],
186
186
  :SDL_LoadFile => [:pointer, :pointer],
@@ -209,8 +209,8 @@ module SDL
209
209
  :SDL_RWsize => :long_long,
210
210
  :SDL_RWseek => :long_long,
211
211
  :SDL_RWtell => :long_long,
212
- :SDL_RWread => :int,
213
- :SDL_RWwrite => :int,
212
+ :SDL_RWread => :size_t,
213
+ :SDL_RWwrite => :size_t,
214
214
  :SDL_RWclose => :int,
215
215
  :SDL_LoadFile_RW => :pointer,
216
216
  :SDL_LoadFile => :pointer,
@@ -221,13 +221,13 @@ module SDL
221
221
  :SDL_ReadBE32 => :uint,
222
222
  :SDL_ReadLE64 => :ulong_long,
223
223
  :SDL_ReadBE64 => :ulong_long,
224
- :SDL_WriteU8 => :int,
225
- :SDL_WriteLE16 => :int,
226
- :SDL_WriteBE16 => :int,
227
- :SDL_WriteLE32 => :int,
228
- :SDL_WriteBE32 => :int,
229
- :SDL_WriteLE64 => :int,
230
- :SDL_WriteBE64 => :int,
224
+ :SDL_WriteU8 => :size_t,
225
+ :SDL_WriteLE16 => :size_t,
226
+ :SDL_WriteBE16 => :size_t,
227
+ :SDL_WriteLE32 => :size_t,
228
+ :SDL_WriteBE32 => :size_t,
229
+ :SDL_WriteLE64 => :size_t,
230
+ :SDL_WriteBE64 => :size_t,
231
231
  }
232
232
  symbols.each do |sym|
233
233
  begin
data/lib/sdl2_stdinc.rb CHANGED
@@ -22,14 +22,6 @@ module SDL
22
22
 
23
23
  # Typedef
24
24
 
25
- typedef :char, :int8_t
26
- typedef :short, :int16_t
27
- typedef :int, :int32_t
28
- typedef :long_long, :int64_t
29
- typedef :uchar, :uint8_t
30
- typedef :ushort, :uint16_t
31
- typedef :uint, :uint32_t
32
- typedef :ulong_long, :uint64_t
33
25
  typedef :int, :SDL_bool
34
26
  typedef :char, :Sint8
35
27
  typedef :uchar, :Uint8
@@ -39,9 +31,9 @@ module SDL
39
31
  typedef :uint, :Uint32
40
32
  typedef :long_long, :Sint64
41
33
  typedef :ulong_long, :Uint64
42
- callback :SDL_malloc_func, [:int], :pointer
43
- callback :SDL_calloc_func, [:int, :int], :pointer
44
- callback :SDL_realloc_func, [:pointer, :int], :pointer
34
+ callback :SDL_malloc_func, [:ulong], :pointer
35
+ callback :SDL_calloc_func, [:ulong, :ulong], :pointer
36
+ callback :SDL_realloc_func, [:pointer, :ulong], :pointer
45
37
  callback :SDL_free_func, [:pointer], :void
46
38
  typedef :pointer, :SDL_iconv_t
47
39
 
@@ -298,16 +290,16 @@ module SDL
298
290
  :SDL_iconv_string => :iconv_string,
299
291
  }
300
292
  args = {
301
- :SDL_malloc => [:int],
302
- :SDL_calloc => [:int, :int],
303
- :SDL_realloc => [:pointer, :int],
293
+ :SDL_malloc => [:ulong],
294
+ :SDL_calloc => [:ulong, :ulong],
295
+ :SDL_realloc => [:pointer, :ulong],
304
296
  :SDL_free => [:pointer],
305
297
  :SDL_GetMemoryFunctions => [:pointer, :pointer, :pointer, :pointer],
306
298
  :SDL_SetMemoryFunctions => [:SDL_malloc_func, :SDL_calloc_func, :SDL_realloc_func, :SDL_free_func],
307
299
  :SDL_GetNumAllocations => [],
308
300
  :SDL_getenv => [:pointer],
309
301
  :SDL_setenv => [:pointer, :pointer, :int],
310
- :SDL_qsort => [:pointer, :int, :int, :pointer],
302
+ :SDL_qsort => [:pointer, :ulong, :ulong, :pointer],
311
303
  :SDL_abs => [:int],
312
304
  :SDL_isalpha => [:int],
313
305
  :SDL_isalnum => [:int],
@@ -323,24 +315,24 @@ module SDL
323
315
  :SDL_isgraph => [:int],
324
316
  :SDL_toupper => [:int],
325
317
  :SDL_tolower => [:int],
326
- :SDL_crc32 => [:uint, :pointer, :int],
327
- :SDL_memset => [:pointer, :int, :int],
328
- :SDL_memcpy => [:pointer, :pointer, :int],
329
- :SDL_memmove => [:pointer, :pointer, :int],
330
- :SDL_memcmp => [:pointer, :pointer, :int],
318
+ :SDL_crc32 => [:uint, :pointer, :ulong],
319
+ :SDL_memset => [:pointer, :int, :ulong],
320
+ :SDL_memcpy => [:pointer, :pointer, :ulong],
321
+ :SDL_memmove => [:pointer, :pointer, :ulong],
322
+ :SDL_memcmp => [:pointer, :pointer, :ulong],
331
323
  :SDL_wcslen => [:pointer],
332
- :SDL_wcslcpy => [:pointer, :pointer, :int],
333
- :SDL_wcslcat => [:pointer, :pointer, :int],
324
+ :SDL_wcslcpy => [:pointer, :pointer, :ulong],
325
+ :SDL_wcslcat => [:pointer, :pointer, :ulong],
334
326
  :SDL_wcsdup => [:pointer],
335
327
  :SDL_wcsstr => [:pointer, :pointer],
336
328
  :SDL_wcscmp => [:pointer, :pointer],
337
- :SDL_wcsncmp => [:pointer, :pointer, :int],
329
+ :SDL_wcsncmp => [:pointer, :pointer, :ulong],
338
330
  :SDL_wcscasecmp => [:pointer, :pointer],
339
- :SDL_wcsncasecmp => [:pointer, :pointer, :int],
331
+ :SDL_wcsncasecmp => [:pointer, :pointer, :ulong],
340
332
  :SDL_strlen => [:pointer],
341
- :SDL_strlcpy => [:pointer, :pointer, :int],
342
- :SDL_utf8strlcpy => [:pointer, :pointer, :int],
343
- :SDL_strlcat => [:pointer, :pointer, :int],
333
+ :SDL_strlcpy => [:pointer, :pointer, :ulong],
334
+ :SDL_utf8strlcpy => [:pointer, :pointer, :ulong],
335
+ :SDL_strlcat => [:pointer, :pointer, :ulong],
344
336
  :SDL_strdup => [:pointer],
345
337
  :SDL_strrev => [:pointer],
346
338
  :SDL_strupr => [:pointer],
@@ -364,15 +356,15 @@ module SDL
364
356
  :SDL_strtoull => [:pointer, :pointer, :int],
365
357
  :SDL_strtod => [:pointer, :pointer],
366
358
  :SDL_strcmp => [:pointer, :pointer],
367
- :SDL_strncmp => [:pointer, :pointer, :int],
359
+ :SDL_strncmp => [:pointer, :pointer, :ulong],
368
360
  :SDL_strcasecmp => [:pointer, :pointer],
369
- :SDL_strncasecmp => [:pointer, :pointer, :int],
361
+ :SDL_strncasecmp => [:pointer, :pointer, :ulong],
370
362
  :SDL_sscanf => [:pointer, :pointer],
371
- :SDL_vsscanf => [:pointer, :pointer, :int],
372
- :SDL_snprintf => [:pointer, :int, :pointer],
373
- :SDL_vsnprintf => [:pointer, :int, :pointer, :int],
363
+ :SDL_vsscanf => [:pointer, :pointer, :pointer],
364
+ :SDL_snprintf => [:pointer, :ulong, :pointer],
365
+ :SDL_vsnprintf => [:pointer, :ulong, :pointer, :pointer],
374
366
  :SDL_asprintf => [:pointer, :pointer],
375
- :SDL_vasprintf => [:pointer, :pointer, :int],
367
+ :SDL_vasprintf => [:pointer, :pointer, :pointer],
376
368
  :SDL_acos => [:double],
377
369
  :SDL_acosf => [:float],
378
370
  :SDL_asin => [:double],
@@ -418,7 +410,7 @@ module SDL
418
410
  :SDL_iconv_open => [:pointer, :pointer],
419
411
  :SDL_iconv_close => [:pointer],
420
412
  :SDL_iconv => [:pointer, :pointer, :pointer, :pointer, :pointer],
421
- :SDL_iconv_string => [:pointer, :pointer, :pointer, :int],
413
+ :SDL_iconv_string => [:pointer, :pointer, :pointer, :ulong],
422
414
  }
423
415
  retvals = {
424
416
  :SDL_malloc => :pointer,
@@ -451,19 +443,19 @@ module SDL
451
443
  :SDL_memcpy => :pointer,
452
444
  :SDL_memmove => :pointer,
453
445
  :SDL_memcmp => :int,
454
- :SDL_wcslen => :int,
455
- :SDL_wcslcpy => :int,
456
- :SDL_wcslcat => :int,
446
+ :SDL_wcslen => :size_t,
447
+ :SDL_wcslcpy => :size_t,
448
+ :SDL_wcslcat => :size_t,
457
449
  :SDL_wcsdup => :pointer,
458
450
  :SDL_wcsstr => :pointer,
459
451
  :SDL_wcscmp => :int,
460
452
  :SDL_wcsncmp => :int,
461
453
  :SDL_wcscasecmp => :int,
462
454
  :SDL_wcsncasecmp => :int,
463
- :SDL_strlen => :int,
464
- :SDL_strlcpy => :int,
465
- :SDL_utf8strlcpy => :int,
466
- :SDL_strlcat => :int,
455
+ :SDL_strlen => :size_t,
456
+ :SDL_strlcpy => :size_t,
457
+ :SDL_utf8strlcpy => :size_t,
458
+ :SDL_strlcat => :size_t,
467
459
  :SDL_strdup => :pointer,
468
460
  :SDL_strrev => :pointer,
469
461
  :SDL_strupr => :pointer,
@@ -472,7 +464,7 @@ module SDL
472
464
  :SDL_strrchr => :pointer,
473
465
  :SDL_strstr => :pointer,
474
466
  :SDL_strtokr => :pointer,
475
- :SDL_utf8strlen => :int,
467
+ :SDL_utf8strlen => :size_t,
476
468
  :SDL_itoa => :pointer,
477
469
  :SDL_uitoa => :pointer,
478
470
  :SDL_ltoa => :pointer,
@@ -540,7 +532,7 @@ module SDL
540
532
  :SDL_tanf => :float,
541
533
  :SDL_iconv_open => :pointer,
542
534
  :SDL_iconv_close => :int,
543
- :SDL_iconv => :int,
535
+ :SDL_iconv => :size_t,
544
536
  :SDL_iconv_string => :pointer,
545
537
  }
546
538
  symbols.each do |sym|
data/lib/sdl2_ttf.rb CHANGED
@@ -12,8 +12,8 @@ module SDL
12
12
  # Define/Macro
13
13
 
14
14
  TTF_MAJOR_VERSION = 2
15
- TTF_MINOR_VERSION = 0
16
- TTF_PATCHLEVEL = 15
15
+ TTF_MINOR_VERSION = 20
16
+ TTF_PATCHLEVEL = 0
17
17
  TTF_STYLE_NORMAL = 0x00
18
18
  TTF_STYLE_BOLD = 0x01
19
19
  TTF_STYLE_ITALIC = 0x02
@@ -24,12 +24,20 @@ module SDL
24
24
  TTF_HINTING_MONO = 2
25
25
  TTF_HINTING_NONE = 3
26
26
  TTF_HINTING_LIGHT_SUBPIXEL = 4
27
+ TTF_WRAPPED_ALIGN_LEFT = 0
28
+ TTF_WRAPPED_ALIGN_CENTER = 1
29
+ TTF_WRAPPED_ALIGN_RIGHT = 2
27
30
 
28
31
  # Enum
29
32
 
33
+ TTF_DIRECTION_LTR = 0
34
+ TTF_DIRECTION_RTL = 1
35
+ TTF_DIRECTION_TTB = 2
36
+ TTF_DIRECTION_BTT = 3
30
37
 
31
38
  # Typedef
32
39
 
40
+ typedef :int, :TTF_Direction
33
41
 
34
42
  # Struct
35
43
 
@@ -59,6 +67,8 @@ module SDL
59
67
  :TTF_SetFontOutline,
60
68
  :TTF_GetFontHinting,
61
69
  :TTF_SetFontHinting,
70
+ :TTF_GetFontWrappedAlign,
71
+ :TTF_SetFontWrappedAlign,
62
72
  :TTF_FontHeight,
63
73
  :TTF_FontAscent,
64
74
  :TTF_FontDescent,
@@ -103,8 +113,14 @@ module SDL
103
113
  :TTF_RenderUNICODE_Blended_Wrapped,
104
114
  :TTF_RenderGlyph_Blended,
105
115
  :TTF_RenderGlyph32_Blended,
106
- :TTF_SetDirection,
107
- :TTF_SetScript,
116
+ :TTF_RenderText_LCD,
117
+ :TTF_RenderUTF8_LCD,
118
+ :TTF_RenderUNICODE_LCD,
119
+ :TTF_RenderText_LCD_Wrapped,
120
+ :TTF_RenderUTF8_LCD_Wrapped,
121
+ :TTF_RenderUNICODE_LCD_Wrapped,
122
+ :TTF_RenderGlyph_LCD,
123
+ :TTF_RenderGlyph32_LCD,
108
124
  :TTF_CloseFont,
109
125
  :TTF_Quit,
110
126
  :TTF_WasInit,
@@ -113,6 +129,10 @@ module SDL
113
129
  :TTF_GetFontKerningSizeGlyphs32,
114
130
  :TTF_SetFontSDF,
115
131
  :TTF_GetFontSDF,
132
+ :TTF_SetDirection,
133
+ :TTF_SetScript,
134
+ :TTF_SetFontDirection,
135
+ :TTF_SetFontScriptName,
116
136
  ]
117
137
  apis = {
118
138
  :TTF_Linked_Version => :TTF_Linked_Version,
@@ -136,6 +156,8 @@ module SDL
136
156
  :TTF_SetFontOutline => :TTF_SetFontOutline,
137
157
  :TTF_GetFontHinting => :TTF_GetFontHinting,
138
158
  :TTF_SetFontHinting => :TTF_SetFontHinting,
159
+ :TTF_GetFontWrappedAlign => :TTF_GetFontWrappedAlign,
160
+ :TTF_SetFontWrappedAlign => :TTF_SetFontWrappedAlign,
139
161
  :TTF_FontHeight => :TTF_FontHeight,
140
162
  :TTF_FontAscent => :TTF_FontAscent,
141
163
  :TTF_FontDescent => :TTF_FontDescent,
@@ -180,8 +202,14 @@ module SDL
180
202
  :TTF_RenderUNICODE_Blended_Wrapped => :TTF_RenderUNICODE_Blended_Wrapped,
181
203
  :TTF_RenderGlyph_Blended => :TTF_RenderGlyph_Blended,
182
204
  :TTF_RenderGlyph32_Blended => :TTF_RenderGlyph32_Blended,
183
- :TTF_SetDirection => :TTF_SetDirection,
184
- :TTF_SetScript => :TTF_SetScript,
205
+ :TTF_RenderText_LCD => :TTF_RenderText_LCD,
206
+ :TTF_RenderUTF8_LCD => :TTF_RenderUTF8_LCD,
207
+ :TTF_RenderUNICODE_LCD => :TTF_RenderUNICODE_LCD,
208
+ :TTF_RenderText_LCD_Wrapped => :TTF_RenderText_LCD_Wrapped,
209
+ :TTF_RenderUTF8_LCD_Wrapped => :TTF_RenderUTF8_LCD_Wrapped,
210
+ :TTF_RenderUNICODE_LCD_Wrapped => :TTF_RenderUNICODE_LCD_Wrapped,
211
+ :TTF_RenderGlyph_LCD => :TTF_RenderGlyph_LCD,
212
+ :TTF_RenderGlyph32_LCD => :TTF_RenderGlyph32_LCD,
185
213
  :TTF_CloseFont => :TTF_CloseFont,
186
214
  :TTF_Quit => :TTF_Quit,
187
215
  :TTF_WasInit => :TTF_WasInit,
@@ -190,6 +218,10 @@ module SDL
190
218
  :TTF_GetFontKerningSizeGlyphs32 => :TTF_GetFontKerningSizeGlyphs32,
191
219
  :TTF_SetFontSDF => :TTF_SetFontSDF,
192
220
  :TTF_GetFontSDF => :TTF_GetFontSDF,
221
+ :TTF_SetDirection => :TTF_SetDirection,
222
+ :TTF_SetScript => :TTF_SetScript,
223
+ :TTF_SetFontDirection => :TTF_SetFontDirection,
224
+ :TTF_SetFontScriptName => :TTF_SetFontScriptName,
193
225
  }
194
226
  args = {
195
227
  :TTF_Linked_Version => [],
@@ -213,6 +245,8 @@ module SDL
213
245
  :TTF_SetFontOutline => [:pointer, :int],
214
246
  :TTF_GetFontHinting => [:pointer],
215
247
  :TTF_SetFontHinting => [:pointer, :int],
248
+ :TTF_GetFontWrappedAlign => [:pointer],
249
+ :TTF_SetFontWrappedAlign => [:pointer, :int],
216
250
  :TTF_FontHeight => [:pointer],
217
251
  :TTF_FontAscent => [:pointer],
218
252
  :TTF_FontDescent => [:pointer],
@@ -257,8 +291,14 @@ module SDL
257
291
  :TTF_RenderUNICODE_Blended_Wrapped => [:pointer, :pointer, Color.by_value, :uint],
258
292
  :TTF_RenderGlyph_Blended => [:pointer, :ushort, Color.by_value],
259
293
  :TTF_RenderGlyph32_Blended => [:pointer, :uint, Color.by_value],
260
- :TTF_SetDirection => [:int],
261
- :TTF_SetScript => [:int],
294
+ :TTF_RenderText_LCD => [:pointer, :pointer, Color.by_value, Color.by_value],
295
+ :TTF_RenderUTF8_LCD => [:pointer, :pointer, Color.by_value, Color.by_value],
296
+ :TTF_RenderUNICODE_LCD => [:pointer, :pointer, Color.by_value, Color.by_value],
297
+ :TTF_RenderText_LCD_Wrapped => [:pointer, :pointer, Color.by_value, Color.by_value, :uint],
298
+ :TTF_RenderUTF8_LCD_Wrapped => [:pointer, :pointer, Color.by_value, Color.by_value, :uint],
299
+ :TTF_RenderUNICODE_LCD_Wrapped => [:pointer, :pointer, Color.by_value, Color.by_value, :uint],
300
+ :TTF_RenderGlyph_LCD => [:pointer, :ushort, Color.by_value, Color.by_value],
301
+ :TTF_RenderGlyph32_LCD => [:pointer, :uint, Color.by_value, Color.by_value],
262
302
  :TTF_CloseFont => [:pointer],
263
303
  :TTF_Quit => [],
264
304
  :TTF_WasInit => [],
@@ -267,6 +307,10 @@ module SDL
267
307
  :TTF_GetFontKerningSizeGlyphs32 => [:pointer, :uint, :uint],
268
308
  :TTF_SetFontSDF => [:pointer, :int],
269
309
  :TTF_GetFontSDF => [:pointer],
310
+ :TTF_SetDirection => [:int],
311
+ :TTF_SetScript => [:int],
312
+ :TTF_SetFontDirection => [:pointer, :int],
313
+ :TTF_SetFontScriptName => [:pointer, :pointer],
270
314
  }
271
315
  retvals = {
272
316
  :TTF_Linked_Version => :pointer,
@@ -290,6 +334,8 @@ module SDL
290
334
  :TTF_SetFontOutline => :void,
291
335
  :TTF_GetFontHinting => :int,
292
336
  :TTF_SetFontHinting => :void,
337
+ :TTF_GetFontWrappedAlign => :int,
338
+ :TTF_SetFontWrappedAlign => :void,
293
339
  :TTF_FontHeight => :int,
294
340
  :TTF_FontAscent => :int,
295
341
  :TTF_FontDescent => :int,
@@ -334,8 +380,14 @@ module SDL
334
380
  :TTF_RenderUNICODE_Blended_Wrapped => :pointer,
335
381
  :TTF_RenderGlyph_Blended => :pointer,
336
382
  :TTF_RenderGlyph32_Blended => :pointer,
337
- :TTF_SetDirection => :int,
338
- :TTF_SetScript => :int,
383
+ :TTF_RenderText_LCD => :pointer,
384
+ :TTF_RenderUTF8_LCD => :pointer,
385
+ :TTF_RenderUNICODE_LCD => :pointer,
386
+ :TTF_RenderText_LCD_Wrapped => :pointer,
387
+ :TTF_RenderUTF8_LCD_Wrapped => :pointer,
388
+ :TTF_RenderUNICODE_LCD_Wrapped => :pointer,
389
+ :TTF_RenderGlyph_LCD => :pointer,
390
+ :TTF_RenderGlyph32_LCD => :pointer,
339
391
  :TTF_CloseFont => :void,
340
392
  :TTF_Quit => :void,
341
393
  :TTF_WasInit => :int,
@@ -344,6 +396,10 @@ module SDL
344
396
  :TTF_GetFontKerningSizeGlyphs32 => :int,
345
397
  :TTF_SetFontSDF => :int,
346
398
  :TTF_GetFontSDF => :int,
399
+ :TTF_SetDirection => :int,
400
+ :TTF_SetScript => :int,
401
+ :TTF_SetFontDirection => :int,
402
+ :TTF_SetFontScriptName => :int,
347
403
  }
348
404
  symbols.each do |sym|
349
405
  begin
data/lib/sdl2_version.rb CHANGED
@@ -12,7 +12,7 @@ module SDL
12
12
 
13
13
  MAJOR_VERSION = 2
14
14
  MINOR_VERSION = 0
15
- PATCHLEVEL = 20
15
+ PATCHLEVEL = 22
16
16
 
17
17
  # Enum
18
18
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sdl2-bindings
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - vaiorabbit
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-05 00:00:00.000000000 Z
11
+ date: 2022-07-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ffi