1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
|
From: Rob Miller <rob@kalistra.com>
Date: Thu, 28 Nov 2024 12:01:41 -0800
Subject: [PATCH] Use `*lo_message_` instead of `*void` for data arg in liblo
handler methods
Forwarded: https://github.com/essej/sooperlooper/pull/55.
---
src/control_osc.cpp | 56 ++++++++++++++++++++++++------------------------
src/control_osc.hpp | 56 ++++++++++++++++++++++++------------------------
src/gui/loop_control.cpp | 10 ++++-----
src/gui/loop_control.hpp | 10 ++++-----
src/slconsole.cpp | 4 ++--
5 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/src/control_osc.cpp b/src/control_osc.cpp
index d431c75..ecaef5b 100644
--- a/src/control_osc.cpp
+++ b/src/control_osc.cpp
@@ -506,7 +506,7 @@ ControlOSC::osc_receiver()
int ControlOSC::_dummy_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
#ifdef DEBUG
cerr << "got path: " << path << endl;
@@ -516,7 +516,7 @@ int ControlOSC::_dummy_handler(const char *path, const char *types, lo_arg **arg
int ControlOSC::_quit_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->quit_handler (path, types, argv, argc, data);
@@ -524,7 +524,7 @@ int ControlOSC::_quit_handler(const char *path, const char *types, lo_arg **argv
}
int ControlOSC::_ping_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->ping_handler (path, types, argv, argc, data);
@@ -532,14 +532,14 @@ int ControlOSC::_ping_handler(const char *path, const char *types, lo_arg **argv
}
int ControlOSC::_global_set_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_set_handler (path, types, argv, argc, data);
}
int ControlOSC::_global_get_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_get_handler (path, types, argv, argc, data);
@@ -548,126 +548,126 @@ int ControlOSC::_global_get_handler(const char *path, const char *types, lo_arg
int ControlOSC::_updown_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->updown_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_set_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->set_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_get_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->get_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->register_update_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->unregister_update_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->register_auto_update_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->unregister_auto_update_handler (path, types, argv, argc, data, cp);
}
-int ControlOSC::_loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->loop_add_handler (path, types, argv, argc, data);
}
-int ControlOSC::_loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->loop_del_handler (path, types, argv, argc, data);
}
-int ControlOSC::_load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->load_session_handler (path, types, argv, argc, data);
}
-int ControlOSC::_save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->save_session_handler (path, types, argv, argc, data);
}
int ControlOSC::_register_config_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->register_config_handler (path, types, argv, argc, data);
}
int ControlOSC::_unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->unregister_config_handler (path, types, argv, argc, data);
}
-int ControlOSC::_loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->loadloop_handler (path, types, argv, argc, data, cp);
}
-int ControlOSC::_saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->saveloop_handler (path, types, argv, argc, data, cp);
}
int ControlOSC::_global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_register_update_handler (path, types, argv, argc, data);
}
int ControlOSC::_global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_unregister_update_handler (path, types, argv, argc, data);
}
int ControlOSC::_global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_register_auto_update_handler (path, types, argv, argc, data);
}
int ControlOSC::_global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_unregister_auto_update_handler (path, types, argv, argc, data);
@@ -675,27 +675,27 @@ int ControlOSC::_global_unregister_auto_update_handler(const char *path, const c
int ControlOSC::_midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_start_handler (path, types, argv, argc, data);
}
int ControlOSC::_midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_stop_handler (path, types, argv, argc, data);
}
int ControlOSC::_midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_tick_handler (path, types, argv, argc, data);
}
-int ControlOSC::_midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
+int ControlOSC::_midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
MidiBindCommand * cp = static_cast<MidiBindCommand*> (user_data);
return cp->osc->midi_binding_handler (path, types, argv, argc, data, cp);
diff --git a/src/control_osc.hpp b/src/control_osc.hpp
index d83564f..5c3f5cd 100644
--- a/src/control_osc.hpp
+++ b/src/control_osc.hpp
@@ -117,37 +117,37 @@ class ControlOSC
lo_address find_or_cache_addr(std::string returl);
- static int _quit_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_set_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_get_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _updown_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _set_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _get_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _dummy_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _ping_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _register_config_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
+ static int _quit_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_set_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_get_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _updown_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _set_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _get_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _dummy_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _ping_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _register_config_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
- static int _midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
- static int _midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
+ static int _midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
+ static int _midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
- static int _midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
+ static int _midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
bool init_osc_thread();
diff --git a/src/gui/loop_control.cpp b/src/gui/loop_control.cpp
index cc87cf7..7c85209 100644
--- a/src/gui/loop_control.cpp
+++ b/src/gui/loop_control.cpp
@@ -658,7 +658,7 @@ bool LoopControl::spawn_looper()
int
LoopControl::_pingack_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
LoopControl * lc = static_cast<LoopControl*> (user_data);
return lc->pingack_handler (path, types, argv, argc, data);
@@ -753,7 +753,7 @@ LoopControl::pingack_handler(const char *path, const char *types, lo_arg **argv,
int
LoopControl::_alive_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
LoopControl * lc = static_cast<LoopControl*> (user_data);
return lc->alive_handler (path, types, argv, argc, data);
@@ -777,7 +777,7 @@ LoopControl::alive_handler(const char *path, const char *types, lo_arg **argv, i
int
LoopControl::_error_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
LoopControl * lc = static_cast<LoopControl*> (user_data);
return lc->error_handler (path, types, argv, argc, data);
@@ -798,7 +798,7 @@ LoopControl::error_handler(const char *path, const char *types, lo_arg **argv, i
int
LoopControl::_control_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
LoopControl * lc = static_cast<LoopControl*> (user_data);
return lc->control_handler (path, types, argv, argc, data);
@@ -853,7 +853,7 @@ LoopControl::control_handler(const char *path, const char *types, lo_arg **argv,
int
LoopControl::_midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
LoopControl * lc = static_cast<LoopControl*> (user_data);
return lc->midi_binding_handler (path, types, argv, argc, data);
diff --git a/src/gui/loop_control.hpp b/src/gui/loop_control.hpp
index e29dfe1..8691cfb 100644
--- a/src/gui/loop_control.hpp
+++ b/src/gui/loop_control.hpp
@@ -168,27 +168,27 @@ class LoopControl
protected:
static int _control_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data);
+ lo_message_ *data, void *user_data);
int control_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data);
static int _pingack_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data);
+ lo_message_ *data, void *user_data);
int pingack_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data);
static int _midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data);
+ lo_message_ *data, void *user_data);
int midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data);
static int _alive_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data);
+ lo_message_ *data, void *user_data);
int alive_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data);
static int _error_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data);
+ lo_message_ *data, void *user_data);
int error_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data);
diff --git a/src/slconsole.cpp b/src/slconsole.cpp
index 3c6a1db..13a09b6 100644
--- a/src/slconsole.cpp
+++ b/src/slconsole.cpp
@@ -273,7 +273,7 @@ static int post_event(char cmd)
}
static int ctrl_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
// 1st arg is instance, 2nd ctrl string, 3nd is float value
//int index = argv[0]->i;
@@ -288,7 +288,7 @@ static int ctrl_handler(const char *path, const char *types, lo_arg **argv, int
}
static int pingack_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ lo_message_ *data, void *user_data)
{
// pingack expects: s:engine_url s:version i:loopcount
// 1st arg is instance, 2nd ctrl string, 3nd is float value
|
