diff options
-rw-r--r-- | auto_tests/monolith_test.cpp | 2 | ||||
-rw-r--r-- | toxcore/group.c | 24 | ||||
-rw-r--r-- | toxcore/group.h | 13 | ||||
-rw-r--r-- | toxcore/tox.api.h | 32 | ||||
-rw-r--r-- | toxcore/tox.c | 7 | ||||
-rw-r--r-- | toxcore/tox.h | 41 |
6 files changed, 1 insertions, 118 deletions
diff --git a/auto_tests/monolith_test.cpp b/auto_tests/monolith_test.cpp index 60bafeb5..50c59995 100644 --- a/auto_tests/monolith_test.cpp +++ b/auto_tests/monolith_test.cpp | |||
@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) | |||
227 | CHECK_SIZE(Friend_Requests, 1080); | 227 | CHECK_SIZE(Friend_Requests, 1080); |
228 | // toxcore/group | 228 | // toxcore/group |
229 | CHECK_SIZE(Group_c, 728); | 229 | CHECK_SIZE(Group_c, 728); |
230 | CHECK_SIZE(Group_Chats, 2128); | 230 | CHECK_SIZE(Group_Chats, 2120); |
231 | CHECK_SIZE(Group_Peer, 480); | 231 | CHECK_SIZE(Group_Peer, 480); |
232 | // toxcore/list | 232 | // toxcore/list |
233 | CHECK_SIZE(BS_LIST, 32); | 233 | CHECK_SIZE(BS_LIST, 32); |
diff --git a/toxcore/group.c b/toxcore/group.c index 6e8df0f8..37b4437d 100644 --- a/toxcore/group.c +++ b/toxcore/group.c | |||
@@ -455,10 +455,6 @@ static int addpeer(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_p | |||
455 | 455 | ||
456 | add_to_closest(g_c, groupnumber, real_pk, temp_pk); | 456 | add_to_closest(g_c, groupnumber, real_pk, temp_pk); |
457 | 457 | ||
458 | if (do_gc_callback && g_c->group_namelistchange) { | ||
459 | g_c->group_namelistchange(g_c->m, groupnumber, g->numpeers - 1, CHAT_CHANGE_PEER_ADD, userdata); | ||
460 | } | ||
461 | |||
462 | if (do_gc_callback && g_c->peer_list_changed_callback) { | 458 | if (do_gc_callback && g_c->peer_list_changed_callback) { |
463 | g_c->peer_list_changed_callback(g_c->m, groupnumber, userdata); | 459 | g_c->peer_list_changed_callback(g_c->m, groupnumber, userdata); |
464 | } | 460 | } |
@@ -547,10 +543,6 @@ static int delpeer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, void | |||
547 | g->group = temp; | 543 | g->group = temp; |
548 | } | 544 | } |
549 | 545 | ||
550 | if (g_c->group_namelistchange) { | ||
551 | g_c->group_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_DEL, userdata); | ||
552 | } | ||
553 | |||
554 | if (g_c->peer_list_changed_callback) { | 546 | if (g_c->peer_list_changed_callback) { |
555 | g_c->peer_list_changed_callback(g_c->m, groupnumber, userdata); | 547 | g_c->peer_list_changed_callback(g_c->m, groupnumber, userdata); |
556 | } | 548 | } |
@@ -597,10 +589,6 @@ static int setnick(Group_Chats *g_c, uint32_t groupnumber, int peer_index, const | |||
597 | 589 | ||
598 | g->group[peer_index].nick_len = nick_len; | 590 | g->group[peer_index].nick_len = nick_len; |
599 | 591 | ||
600 | if (do_gc_callback && g_c->group_namelistchange) { | ||
601 | g_c->group_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_NAME, userdata); | ||
602 | } | ||
603 | |||
604 | if (do_gc_callback && g_c->peer_name_callback) { | 592 | if (do_gc_callback && g_c->peer_name_callback) { |
605 | g_c->peer_name_callback(g_c->m, groupnumber, peer_index, nick, nick_len, userdata); | 593 | g_c->peer_name_callback(g_c->m, groupnumber, peer_index, nick, nick_len, userdata); |
606 | } | 594 | } |
@@ -1175,18 +1163,6 @@ void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger * | |||
1175 | g_c->peer_list_changed_callback = function; | 1163 | g_c->peer_list_changed_callback = function; |
1176 | } | 1164 | } |
1177 | 1165 | ||
1178 | // TODO(sudden6): function signatures in comments are incorrect | ||
1179 | /* Set callback function for peer name list changes. | ||
1180 | * | ||
1181 | * It gets called every time the name list changes(new peer/name, deleted peer) | ||
1182 | * Function(Group_Chats *g_c, int groupnumber, int peernumber, TOX_CHAT_CHANGE change, void *userdata) | ||
1183 | */ | ||
1184 | void g_callback_group_namelistchange(Group_Chats *g_c, void (*function)(Messenger *, uint32_t, uint32_t, int, | ||
1185 | void *)) | ||
1186 | { | ||
1187 | g_c->group_namelistchange = function; | ||
1188 | } | ||
1189 | |||
1190 | // TODO(sudden6): function signatures are incorrect | 1166 | // TODO(sudden6): function signatures are incorrect |
1191 | /* Set callback function for title changes. | 1167 | /* Set callback function for title changes. |
1192 | * | 1168 | * |
diff --git a/toxcore/group.h b/toxcore/group.h index 9bed8477..a81dac39 100644 --- a/toxcore/group.h +++ b/toxcore/group.h | |||
@@ -119,7 +119,6 @@ typedef struct { | |||
119 | void (*message_callback)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *); | 119 | void (*message_callback)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *); |
120 | void (*peer_name_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *); | 120 | void (*peer_name_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *); |
121 | void (*peer_list_changed_callback)(Messenger *m, uint32_t, void *); | 121 | void (*peer_list_changed_callback)(Messenger *m, uint32_t, void *); |
122 | void (*group_namelistchange)(Messenger *m, uint32_t, uint32_t, int, void *); | ||
123 | void (*title_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *); | 122 | void (*title_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *); |
124 | 123 | ||
125 | struct { | 124 | struct { |
@@ -167,18 +166,6 @@ void g_callback_peer_name(Group_Chats *g_c, void (*function)(Messenger *m, uint3 | |||
167 | */ | 166 | */ |
168 | void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, void *)); | 167 | void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, void *)); |
169 | 168 | ||
170 | /* Set callback function for peer name list changes. | ||
171 | * | ||
172 | * It gets called every time the name list changes(new peer/name, deleted peer) | ||
173 | * Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t peernumber, TOX_CHAT_CHANGE change, void *userdata) | ||
174 | */ | ||
175 | enum { | ||
176 | CHAT_CHANGE_PEER_ADD, | ||
177 | CHAT_CHANGE_PEER_DEL, | ||
178 | CHAT_CHANGE_PEER_NAME, | ||
179 | }; | ||
180 | void g_callback_group_namelistchange(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, void *)); | ||
181 | |||
182 | /* Creates a new groupchat and puts it in the chats array. | 169 | /* Creates a new groupchat and puts it in the chats array. |
183 | * | 170 | * |
184 | * type is one of GROUPCHAT_TYPE_* | 171 | * type is one of GROUPCHAT_TYPE_* |
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h index fc5d5593..59af69b9 100644 --- a/toxcore/tox.api.h +++ b/toxcore/tox.api.h | |||
@@ -2158,38 +2158,6 @@ namespace conference { | |||
2158 | 2158 | ||
2159 | } | 2159 | } |
2160 | 2160 | ||
2161 | /** | ||
2162 | * Peer list state change types. | ||
2163 | */ | ||
2164 | enum class STATE_CHANGE { | ||
2165 | /** | ||
2166 | * A peer has joined the conference. | ||
2167 | */ | ||
2168 | PEER_JOIN, | ||
2169 | /** | ||
2170 | * A peer has exited the conference. | ||
2171 | */ | ||
2172 | PEER_EXIT, | ||
2173 | /** | ||
2174 | * A peer has changed their name. | ||
2175 | */ | ||
2176 | PEER_NAME_CHANGE, | ||
2177 | } | ||
2178 | |||
2179 | /** | ||
2180 | * This event is triggered when the peer list changes (name change, peer join, peer exit). | ||
2181 | * | ||
2182 | * @deprecated Use the `${event peer.name}` and `${event peer.list_changed}` events, instead. | ||
2183 | */ | ||
2184 | event namelist_change const { | ||
2185 | /** | ||
2186 | * @param conference_number The conference number of the conference the title change is intended for. | ||
2187 | * @param peer_number The ID of the peer who changed the title. | ||
2188 | * @param change The type of change (one of $STATE_CHANGE). | ||
2189 | */ | ||
2190 | typedef void(uint32_t conference_number, uint32_t peer_number, STATE_CHANGE change); | ||
2191 | } | ||
2192 | |||
2193 | 2161 | ||
2194 | /** | 2162 | /** |
2195 | * Creates a new conference. | 2163 | * Creates a new conference. |
diff --git a/toxcore/tox.c b/toxcore/tox.c index caaaedba..3db2bd35 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -1116,13 +1116,6 @@ void tox_callback_conference_peer_list_changed(Tox *tox, tox_conference_peer_lis | |||
1116 | g_callback_peer_list_changed((Group_Chats *)m->conferences_object, callback); | 1116 | g_callback_peer_list_changed((Group_Chats *)m->conferences_object, callback); |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback) | ||
1120 | { | ||
1121 | Messenger *m = tox; | ||
1122 | g_callback_group_namelistchange((Group_Chats *)m->conferences_object, | ||
1123 | (void (*)(struct Messenger *, uint32_t, uint32_t, int, void *))callback); | ||
1124 | } | ||
1125 | |||
1126 | uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error) | 1119 | uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error) |
1127 | { | 1120 | { |
1128 | Messenger *m = tox; | 1121 | Messenger *m = tox; |
diff --git a/toxcore/tox.h b/toxcore/tox.h index cf5b2c28..41a0994e 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
@@ -2443,47 +2443,6 @@ typedef void tox_conference_peer_list_changed_cb(Tox *tox, uint32_t conference_n | |||
2443 | */ | 2443 | */ |
2444 | void tox_callback_conference_peer_list_changed(Tox *tox, tox_conference_peer_list_changed_cb *callback); | 2444 | void tox_callback_conference_peer_list_changed(Tox *tox, tox_conference_peer_list_changed_cb *callback); |
2445 | 2445 | ||
2446 | /** | ||
2447 | * Peer list state change types. | ||
2448 | */ | ||
2449 | typedef enum TOX_CONFERENCE_STATE_CHANGE { | ||
2450 | |||
2451 | /** | ||
2452 | * A peer has joined the conference. | ||
2453 | */ | ||
2454 | TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN, | ||
2455 | |||
2456 | /** | ||
2457 | * A peer has exited the conference. | ||
2458 | */ | ||
2459 | TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT, | ||
2460 | |||
2461 | /** | ||
2462 | * A peer has changed their name. | ||
2463 | */ | ||
2464 | TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE, | ||
2465 | |||
2466 | } TOX_CONFERENCE_STATE_CHANGE; | ||
2467 | |||
2468 | |||
2469 | /** | ||
2470 | * @param conference_number The conference number of the conference the title change is intended for. | ||
2471 | * @param peer_number The ID of the peer who changed the title. | ||
2472 | * @param change The type of change (one of TOX_CONFERENCE_STATE_CHANGE). | ||
2473 | */ | ||
2474 | typedef void tox_conference_namelist_change_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number, | ||
2475 | TOX_CONFERENCE_STATE_CHANGE change, void *user_data); | ||
2476 | |||
2477 | |||
2478 | /** | ||
2479 | * Set the callback for the `conference_namelist_change` event. Pass NULL to unset. | ||
2480 | * | ||
2481 | * This event is triggered when the peer list changes (name change, peer join, peer exit). | ||
2482 | * | ||
2483 | * @deprecated Use the `conference_peer_name` and `conference_peer_list_changed` events, instead. | ||
2484 | */ | ||
2485 | void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback); | ||
2486 | |||
2487 | typedef enum TOX_ERR_CONFERENCE_NEW { | 2446 | typedef enum TOX_ERR_CONFERENCE_NEW { |
2488 | 2447 | ||
2489 | /** | 2448 | /** |