Skip to content

Commit 89957be

Browse files
iphydfiphydf
committed
cleanup: Ensure handler params are named after callback params.
1 parent c650d9d commit 89957be

33 files changed

+260
-262
lines changed

‎other/bootstrap_daemon/docker/tox-bootstrapd.sha256‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c31bc1cd7249c62b4f1d2c9ea26c9e8528d9b897dc29afbdbe95894d30c92c8d /usr/local/bin/tox-bootstrapd
1+
3b4f5c3224e919d4474c4af4b5058916b181a2689f59a3b04e72305b454b2ae3 /usr/local/bin/tox-bootstrapd

‎toxav/audio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ void ac_iterate(ACSession *ac)
194194
free(temp_audio_buffer);
195195
}
196196

197-
int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg)
197+
int ac_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg)
198198
{
199-
ACSession *ac = (ACSession *)acp;
199+
ACSession *ac = (ACSession *)cs;
200200

201201
if (ac == nullptr || msg == nullptr) {
202202
free(msg);

‎toxav/audio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t f
6767
toxav_audio_receive_frame_cb *cb, void *cb_data);
6868
void ac_kill(ACSession *ac);
6969
void ac_iterate(ACSession *ac);
70-
int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg);
70+
int ac_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg);
7171
int ac_reconfigure_encoder(ACSession *ac, uint32_t bit_rate, uint32_t sampling_rate, uint8_t channels);
7272

7373
#endif // C_TOXCORE_TOXAV_AUDIO_H

‎toxav/bwcontroller.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct BWCMessage {
5656
uint32_t recv;
5757
};
5858

59-
static int bwc_handle_data(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object);
59+
static int bwc_handle_data(Messenger *m, uint32_t friend_number, const uint8_t *data, uint16_t length, void *object);
6060
static int bwc_send_custom_lossy_packet(Tox *tox, int32_t friendnumber, const uint8_t *data, uint32_t length);
6161
static void send_update(BWController *bwc);
6262

@@ -206,7 +206,7 @@ static int bwc_send_custom_lossy_packet(Tox *tox, int32_t friendnumber, const ui
206206
return -1;
207207
}
208208

209-
static int bwc_handle_data(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object)
209+
static int bwc_handle_data(Messenger *m, uint32_t friend_number, const uint8_t *data, uint16_t length, void *object)
210210
{
211211
BWController *bwc = (BWController *)object;
212212

‎toxav/bwcontroller.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
typedef struct BWController BWController;
1212

13-
typedef void m_cb(BWController *bwc, uint32_t friend_number, float todo, void *user_data);
13+
typedef void m_cb(BWController *bwc, uint32_t friend_number, float loss, void *user_data);
1414

1515
BWController *bwc_new(Messenger *m, Tox *tox, uint32_t friendnumber, m_cb *mcb, void *mcb_user_data,
1616
Mono_Time *bwc_mono_time);

‎toxav/groupav.c‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ static Group_AV *new_group_av(const Logger *log, Tox *tox, Group_Chats *g_c, aud
255255
return group_av;
256256
}
257257

258-
static void group_av_peer_new(void *object, uint32_t groupnumber, uint32_t friendgroupnumber)
258+
static void group_av_peer_new(void *object, uint32_t conference_number, uint32_t peer_number)
259259
{
260260
const Group_AV *group_av = (const Group_AV *)object;
261261
Group_Peer_AV *peer_av = (Group_Peer_AV *)calloc(1, sizeof(Group_Peer_AV));
@@ -267,12 +267,12 @@ static void group_av_peer_new(void *object, uint32_t groupnumber, uint32_t frien
267267
peer_av->mono_time = g_mono_time(group_av->g_c);
268268
peer_av->buffer = create_queue(GROUP_JBUF_SIZE);
269269

270-
if (group_peer_set_object(group_av->g_c, groupnumber, friendgroupnumber, peer_av) == -1) {
270+
if (group_peer_set_object(group_av->g_c, conference_number, peer_number, peer_av) == -1) {
271271
free(peer_av);
272272
}
273273
}
274274

275-
static void group_av_peer_delete(void *object, uint32_t groupnumber, void *peer_object)
275+
static void group_av_peer_delete(void *object, uint32_t conference_number, void *peer_object)
276276
{
277277
Group_Peer_AV *peer_av = (Group_Peer_AV *)peer_object;
278278

@@ -288,16 +288,16 @@ static void group_av_peer_delete(void *object, uint32_t groupnumber, void *peer_
288288
free(peer_object);
289289
}
290290

291-
static void group_av_groupchat_delete(void *object, uint32_t groupnumber)
291+
static void group_av_groupchat_delete(void *object, uint32_t conference_number)
292292
{
293293
Group_AV *group_av = (Group_AV *)object;
294294
if (group_av != nullptr) {
295295
kill_group_av(group_av);
296296
}
297297
}
298298

299-
static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint32_t groupnumber,
300-
uint32_t friendgroupnumber)
299+
static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint32_t conference_number,
300+
uint32_t peer_number)
301301
{
302302
if (group_av == nullptr || peer_av == nullptr) {
303303
return -1;
@@ -391,7 +391,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint3
391391
if (out_audio != nullptr) {
392392

393393
if (group_av->audio_data != nullptr) {
394-
group_av->audio_data(group_av->tox, groupnumber, friendgroupnumber, out_audio, out_audio_samples,
394+
group_av->audio_data(group_av->tox, conference_number, peer_number, out_audio, out_audio_samples,
395395
peer_av->decoder_channels, sample_rate, group_av->userdata);
396396
}
397397

@@ -402,7 +402,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint3
402402
return -1;
403403
}
404404

405-
static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_t friendgroupnumber, void *peer_object,
405+
static int handle_group_audio_packet(void *object, uint32_t conference_number, uint32_t peer_number, void *peer_object,
406406
const uint8_t *packet, uint16_t length)
407407
{
408408
Group_AV *group_av = (Group_AV *)object;
@@ -435,7 +435,7 @@ static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_
435435
return -1;
436436
}
437437

438-
while (decode_audio_packet(group_av, peer_av, groupnumber, friendgroupnumber) == 0) {
438+
while (decode_audio_packet(group_av, peer_av, conference_number, peer_number) == 0) {
439439
/* Continue. */
440440
}
441441

@@ -447,11 +447,11 @@ static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_
447447
* @retval 0 on success.
448448
* @retval -1 on failure.
449449
*/
450-
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
450+
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t conference_number,
451451
audio_data_cb *audio_callback, void *userdata)
452452
{
453-
if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV
454-
|| group_get_object(g_c, groupnumber) != nullptr) {
453+
if (group_get_type(g_c, conference_number) != GROUPCHAT_TYPE_AV
454+
|| group_get_object(g_c, conference_number) != nullptr) {
455455
return -1;
456456
}
457457

@@ -461,23 +461,23 @@ int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t
461461
return -1;
462462
}
463463

464-
if (group_set_object(g_c, groupnumber, group_av) == -1
465-
|| callback_groupchat_peer_new(g_c, groupnumber, group_av_peer_new) == -1
466-
|| callback_groupchat_peer_delete(g_c, groupnumber, group_av_peer_delete) == -1
467-
|| callback_groupchat_delete(g_c, groupnumber, group_av_groupchat_delete) == -1) {
464+
if (group_set_object(g_c, conference_number, group_av) == -1
465+
|| callback_groupchat_peer_new(g_c, conference_number, group_av_peer_new) == -1
466+
|| callback_groupchat_peer_delete(g_c, conference_number, group_av_peer_delete) == -1
467+
|| callback_groupchat_delete(g_c, conference_number, group_av_groupchat_delete) == -1) {
468468
kill_group_av(group_av);
469469
return -1;
470470
}
471471

472-
const int numpeers = group_number_peers(g_c, groupnumber, false);
472+
const int numpeers = group_number_peers(g_c, conference_number, false);
473473

474474
if (numpeers < 0) {
475475
kill_group_av(group_av);
476476
return -1;
477477
}
478478

479479
for (uint32_t i = 0; i < numpeers; ++i) {
480-
group_av_peer_new(group_av, groupnumber, i);
480+
group_av_peer_new(group_av, conference_number, i);
481481
}
482482

483483
group_lossy_packet_registerhandler(g_c, GROUP_AUDIO_PACKET_ID, &handle_group_audio_packet);
@@ -489,46 +489,46 @@ int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t
489489
* @retval 0 on success.
490490
* @retval -1 on failure.
491491
*/
492-
int groupchat_disable_av(const Group_Chats *g_c, uint32_t groupnumber)
492+
int groupchat_disable_av(const Group_Chats *g_c, uint32_t conference_number)
493493
{
494-
if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV) {
494+
if (group_get_type(g_c, conference_number) != GROUPCHAT_TYPE_AV) {
495495
return -1;
496496
}
497497

498-
Group_AV *group_av = (Group_AV *)group_get_object(g_c, groupnumber);
498+
Group_AV *group_av = (Group_AV *)group_get_object(g_c, conference_number);
499499

500500
if (group_av == nullptr) {
501501
return -1;
502502
}
503503

504-
const int numpeers = group_number_peers(g_c, groupnumber, false);
504+
const int numpeers = group_number_peers(g_c, conference_number, false);
505505

506506
if (numpeers < 0) {
507507
kill_group_av(group_av);
508508
return -1;
509509
}
510510

511511
for (uint32_t i = 0; i < numpeers; ++i) {
512-
group_av_peer_delete(group_av, groupnumber, group_peer_get_object(g_c, groupnumber, i));
513-
group_peer_set_object(g_c, groupnumber, i, nullptr);
512+
group_av_peer_delete(group_av, conference_number, group_peer_get_object(g_c, conference_number, i));
513+
group_peer_set_object(g_c, conference_number, i, nullptr);
514514
}
515515

516516
kill_group_av(group_av);
517517

518-
if (group_set_object(g_c, groupnumber, nullptr) == -1
519-
|| callback_groupchat_peer_new(g_c, groupnumber, nullptr) == -1
520-
|| callback_groupchat_peer_delete(g_c, groupnumber, nullptr) == -1
521-
|| callback_groupchat_delete(g_c, groupnumber, nullptr) == -1) {
518+
if (group_set_object(g_c, conference_number, nullptr) == -1
519+
|| callback_groupchat_peer_new(g_c, conference_number, nullptr) == -1
520+
|| callback_groupchat_peer_delete(g_c, conference_number, nullptr) == -1
521+
|| callback_groupchat_delete(g_c, conference_number, nullptr) == -1) {
522522
return -1;
523523
}
524524

525525
return 0;
526526
}
527527

528528
/** Return whether A/V is enabled in the groupchat. */
529-
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t groupnumber)
529+
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t conference_number)
530530
{
531-
return group_get_object(g_c, groupnumber) != nullptr;
531+
return group_get_object(g_c, conference_number) != nullptr;
532532
}
533533

534534
/** @brief Create and connect to a new toxav group.
@@ -538,18 +538,18 @@ bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t groupnumber)
538538
*/
539539
int add_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, audio_data_cb *audio_callback, void *userdata)
540540
{
541-
const int groupnumber = add_groupchat(g_c, tox->sys.rng, GROUPCHAT_TYPE_AV);
541+
const int conference_number = add_groupchat(g_c, tox->sys.rng, GROUPCHAT_TYPE_AV);
542542

543-
if (groupnumber == -1) {
543+
if (conference_number == -1) {
544544
return -1;
545545
}
546546

547-
if (groupchat_enable_av(log, tox, g_c, groupnumber, audio_callback, userdata) == -1) {
548-
del_groupchat(g_c, groupnumber, true);
547+
if (groupchat_enable_av(log, tox, g_c, conference_number, audio_callback, userdata) == -1) {
548+
del_groupchat(g_c, conference_number, true);
549549
return -1;
550550
}
551551

552-
return groupnumber;
552+
return conference_number;
553553
}
554554

555555
/** @brief Join a AV group (you need to have been invited first).
@@ -560,34 +560,34 @@ int add_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, audio_data_c
560560
int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t friendnumber, const uint8_t *data,
561561
uint16_t length, audio_data_cb *audio_callback, void *userdata)
562562
{
563-
const int groupnumber = join_groupchat(g_c, friendnumber, GROUPCHAT_TYPE_AV, data, length);
563+
const int conference_number = join_groupchat(g_c, friendnumber, GROUPCHAT_TYPE_AV, data, length);
564564

565-
if (groupnumber == -1) {
565+
if (conference_number == -1) {
566566
return -1;
567567
}
568568

569-
if (groupchat_enable_av(log, tox, g_c, groupnumber, audio_callback, userdata) == -1) {
570-
del_groupchat(g_c, groupnumber, true);
569+
if (groupchat_enable_av(log, tox, g_c, conference_number, audio_callback, userdata) == -1) {
570+
del_groupchat(g_c, conference_number, true);
571571
return -1;
572572
}
573573

574-
return groupnumber;
574+
return conference_number;
575575
}
576576

577577
/** @brief Send an encoded audio packet to the group chat.
578578
*
579579
* @retval 0 on success.
580580
* @retval -1 on failure.
581581
*/
582-
static int send_audio_packet(const Group_Chats *g_c, uint32_t groupnumber, const uint8_t *packet, uint16_t length)
582+
static int send_audio_packet(const Group_Chats *g_c, uint32_t conference_number, const uint8_t *packet, uint16_t length)
583583
{
584584
if (length == 0 || length > MAX_CRYPTO_DATA_SIZE - 1 - sizeof(uint16_t)) {
585585
return -1;
586586
}
587587

588588
const uint16_t plen = 1 + sizeof(uint16_t) + length;
589589

590-
Group_AV *const group_av = (Group_AV *)group_get_object(g_c, groupnumber);
590+
Group_AV *const group_av = (Group_AV *)group_get_object(g_c, conference_number);
591591

592592
if (group_av == nullptr) {
593593
return -1;
@@ -601,7 +601,7 @@ static int send_audio_packet(const Group_Chats *g_c, uint32_t groupnumber, const
601601
ptr += net_pack_u16(ptr, group_av->audio_sequnum);
602602
memcpy(ptr, packet, length);
603603

604-
if (send_group_lossy_packet(g_c, groupnumber, data, plen) == -1) {
604+
if (send_group_lossy_packet(g_c, conference_number, data, plen) == -1) {
605605
return -1;
606606
}
607607

@@ -614,10 +614,10 @@ static int send_audio_packet(const Group_Chats *g_c, uint32_t groupnumber, const
614614
* @retval 0 on success.
615615
* @retval -1 on failure.
616616
*/
617-
int group_send_audio(const Group_Chats *g_c, uint32_t groupnumber, const int16_t *pcm, unsigned int samples, uint8_t channels,
617+
int group_send_audio(const Group_Chats *g_c, uint32_t conference_number, const int16_t *pcm, unsigned int samples, uint8_t channels,
618618
uint32_t sample_rate)
619619
{
620-
Group_AV *group_av = (Group_AV *)group_get_object(g_c, groupnumber);
620+
Group_AV *group_av = (Group_AV *)group_get_object(g_c, conference_number);
621621

622622
if (group_av == nullptr) {
623623
return -1;
@@ -655,5 +655,5 @@ int group_send_audio(const Group_Chats *g_c, uint32_t groupnumber, const int16_t
655655
return -1;
656656
}
657657

658-
return send_audio_packet(g_c, groupnumber, encoded, size);
658+
return send_audio_packet(g_c, conference_number, encoded, size);
659659
}

‎toxav/groupav.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#define GROUP_AUDIO_PACKET_ID 192
1515

1616
// TODO(iphydf): Use this better typed one instead of the void-pointer one below.
17-
// typedef void audio_data_cb(Tox *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm,
17+
// typedef void audio_data_cb(Tox *tox, uint32_t conference_number, uint32_t peernumber, const int16_t *pcm,
1818
// uint32_t samples, uint8_t channels, uint32_t sample_rate, void *userdata);
19-
typedef void audio_data_cb(void *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm,
19+
typedef void audio_data_cb(void *tox, uint32_t conference_number, uint32_t peernumber, const int16_t *pcm,
2020
uint32_t samples, uint8_t channels, uint32_t sample_rate, void *userdata);
2121

2222
/** @brief Create and connect to a new toxav group.
@@ -40,25 +40,25 @@ int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t fr
4040
* @retval 0 on success.
4141
* @retval -1 on failure.
4242
*/
43-
int group_send_audio(const Group_Chats *g_c, uint32_t groupnumber, const int16_t *pcm, unsigned int samples, uint8_t channels,
43+
int group_send_audio(const Group_Chats *g_c, uint32_t conference_number, const int16_t *pcm, unsigned int samples, uint8_t channels,
4444
uint32_t sample_rate);
4545

4646
/** @brief Enable A/V in a groupchat.
4747
*
4848
* @retval 0 on success.
4949
* @retval -1 on failure.
5050
*/
51-
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
51+
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t conference_number,
5252
audio_data_cb *audio_callback, void *userdata);
5353

5454
/** @brief Disable A/V in a groupchat.
5555
*
5656
* @retval 0 on success.
5757
* @retval -1 on failure.
5858
*/
59-
int groupchat_disable_av(const Group_Chats *g_c, uint32_t groupnumber);
59+
int groupchat_disable_av(const Group_Chats *g_c, uint32_t conference_number);
6060

6161
/** Return whether A/V is enabled in the groupchat. */
62-
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t groupnumber);
62+
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t conference_number);
6363

6464
#endif // C_TOXCORE_TOXAV_GROUPAV_H

0 commit comments

Comments
 (0)