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
|
From 59ec82af8dff4f78ea9d8d92be333a829da79744 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Tue, 11 Jun 2024 15:50:26 +0200
Subject: [PATCH 1/2] Fix signature of multiple callback functions for
lo_server_add_method()
---
src/engine/osclistenermodule.c | 2 +-
src/objects/oscmodule.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/engine/osclistenermodule.c b/src/engine/osclistenermodule.c
index 34c9faa5..79a32873 100644
--- a/src/engine/osclistenermodule.c
+++ b/src/engine/osclistenermodule.c
@@ -46,7 +46,7 @@ OscListener_get(OscListener *self)
}
int process_osc(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ struct lo_message_ *data, void *user_data)
{
OscListener *server = (OscListener *)user_data;
PyObject *tup;
diff --git a/src/objects/oscmodule.c b/src/objects/oscmodule.c
index f1805289..04639e2d 100644
--- a/src/objects/oscmodule.c
+++ b/src/objects/oscmodule.c
@@ -43,7 +43,7 @@ typedef struct
} OscReceiver;
int OscReceiver_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ struct lo_message_ *data, void *user_data)
{
OscReceiver *self = user_data;
PyObject *pathObj = PyUnicode_FromString(path);
@@ -1053,7 +1053,7 @@ typedef struct
} OscDataReceive;
int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ struct lo_message_ *data, void *user_data)
{
OscDataReceive *self = user_data;
PyObject *tup, *result = NULL;
@@ -1367,7 +1367,7 @@ typedef struct
} OscListReceiver;
int OscListReceiver_handler(const char *path, const char *types, lo_arg **argv, int argc,
- void *data, void *user_data)
+ struct lo_message_ *data, void *user_data)
{
OscListReceiver *self = user_data;
@@ -1945,4 +1945,4 @@ PyTypeObject OscListReceiveType =
0, /* tp_init */
0, /* tp_alloc */
OscListReceive_new, /* tp_new */
-};
\ No newline at end of file
+};
--
2.45.2
From e927d865eb007891255ec20df86bb3a05bbbb68e Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Tue, 11 Jun 2024 15:52:42 +0200
Subject: [PATCH 2/2] Fix multiple incorrect declarations of lo_blob and
lo_message
---
src/engine/osclistenermodule.c | 2 +-
src/objects/oscmodule.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/engine/osclistenermodule.c b/src/engine/osclistenermodule.c
index 79a32873..e45ae337 100644
--- a/src/engine/osclistenermodule.c
+++ b/src/engine/osclistenermodule.c
@@ -50,7 +50,7 @@ int process_osc(const char *path, const char *types, lo_arg **argv, int argc,
{
OscListener *server = (OscListener *)user_data;
PyObject *tup;
- lo_blob *blob = NULL;
+ lo_blob blob = NULL;
char *blobdata = NULL;
uint32_t blobsize = 0;
PyObject *charlist = NULL;
diff --git a/src/objects/oscmodule.c b/src/objects/oscmodule.c
index 04639e2d..657c2ec6 100644
--- a/src/objects/oscmodule.c
+++ b/src/objects/oscmodule.c
@@ -787,9 +787,9 @@ OscDataSend_compute_next_data_frame(OscDataSend *self)
PyObject *datalist = NULL;
char *blobdata = NULL;
uint8_t midi[4];
- lo_blob *blob = NULL;
+ lo_blob blob = NULL;
const char *path = NULL;
- lo_message *msg;
+ lo_message msg;
while (self->something_to_send)
{
@@ -1057,7 +1057,7 @@ int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, i
{
OscDataReceive *self = user_data;
PyObject *tup, *result = NULL;
- lo_blob *blob = NULL;
+ lo_blob blob = NULL;
char *blobdata = NULL;
uint32_t blobsize = 0;
PyObject *charlist = NULL;
--
2.45.2
|