Skip to content

Commit

Permalink
cleanup: Ensure handler params are named after callback params.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iphydf
iphydf committed Jan 18, 2024
1 parent c650d9d commit 89957be
Show file tree
Hide file tree
Showing 33 changed files with 260 additions and 262 deletions.
2 changes: 1 addition & 1 deletion other/bootstrap_daemon/docker/tox-bootstrapd.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c31bc1cd7249c62b4f1d2c9ea26c9e8528d9b897dc29afbdbe95894d30c92c8d /usr/local/bin/tox-bootstrapd
3b4f5c3224e919d4474c4af4b5058916b181a2689f59a3b04e72305b454b2ae3 /usr/local/bin/tox-bootstrapd
4 changes: 2 additions & 2 deletions toxav/audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ void ac_iterate(ACSession *ac)
free(temp_audio_buffer);
}

int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg)
int ac_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg)
{
ACSession *ac = (ACSession *)acp;
ACSession *ac = (ACSession *)cs;

if (ac == nullptr || msg == nullptr) {
free(msg);
Expand Down
2 changes: 1 addition & 1 deletion toxav/audio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t f
toxav_audio_receive_frame_cb *cb, void *cb_data);
void ac_kill(ACSession *ac);
void ac_iterate(ACSession *ac);
int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg);
int ac_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg);
int ac_reconfigure_encoder(ACSession *ac, uint32_t bit_rate, uint32_t sampling_rate, uint8_t channels);

#endif // C_TOXCORE_TOXAV_AUDIO_H
4 changes: 2 additions & 2 deletions toxav/bwcontroller.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct BWCMessage {
uint32_t recv;
};

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

Expand Down Expand Up @@ -206,7 +206,7 @@ static int bwc_send_custom_lossy_packet(Tox *tox, int32_t friendnumber, const ui
return -1;
}

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

Expand Down
2 changes: 1 addition & 1 deletion toxav/bwcontroller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

typedef struct BWController BWController;

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

BWController *bwc_new(Messenger *m, Tox *tox, uint32_t friendnumber, m_cb *mcb, void *mcb_user_data,
Mono_Time *bwc_mono_time);
Expand Down
92 changes: 46 additions & 46 deletions toxav/groupav.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ static Group_AV *new_group_av(const Logger *log, Tox *tox, Group_Chats *g_c, aud
return group_av;
}

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

if (group_peer_set_object(group_av->g_c, groupnumber, friendgroupnumber, peer_av) == -1) {
if (group_peer_set_object(group_av->g_c, conference_number, peer_number, peer_av) == -1) {
free(peer_av);
}
}

static void group_av_peer_delete(void *object, uint32_t groupnumber, void *peer_object)
static void group_av_peer_delete(void *object, uint32_t conference_number, void *peer_object)
{
Group_Peer_AV *peer_av = (Group_Peer_AV *)peer_object;

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

static void group_av_groupchat_delete(void *object, uint32_t groupnumber)
static void group_av_groupchat_delete(void *object, uint32_t conference_number)
{
Group_AV *group_av = (Group_AV *)object;
if (group_av != nullptr) {
kill_group_av(group_av);
}
}

static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint32_t groupnumber,
uint32_t friendgroupnumber)
static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint32_t conference_number,
uint32_t peer_number)
{
if (group_av == nullptr || peer_av == nullptr) {
return -1;
Expand Down Expand Up @@ -391,7 +391,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint3
if (out_audio != nullptr) {

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

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

static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_t friendgroupnumber, void *peer_object,
static int handle_group_audio_packet(void *object, uint32_t conference_number, uint32_t peer_number, void *peer_object,
const uint8_t *packet, uint16_t length)
{
Group_AV *group_av = (Group_AV *)object;
Expand Down Expand Up @@ -435,7 +435,7 @@ static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_
return -1;
}

while (decode_audio_packet(group_av, peer_av, groupnumber, friendgroupnumber) == 0) {
while (decode_audio_packet(group_av, peer_av, conference_number, peer_number) == 0) {
/* Continue. */
}

Expand All @@ -447,11 +447,11 @@ static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_
* @retval 0 on success.
* @retval -1 on failure.
*/
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t conference_number,
audio_data_cb *audio_callback, void *userdata)
{
if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV
|| group_get_object(g_c, groupnumber) != nullptr) {
if (group_get_type(g_c, conference_number) != GROUPCHAT_TYPE_AV
|| group_get_object(g_c, conference_number) != nullptr) {
return -1;
}

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

if (group_set_object(g_c, groupnumber, group_av) == -1
|| callback_groupchat_peer_new(g_c, groupnumber, group_av_peer_new) == -1
|| callback_groupchat_peer_delete(g_c, groupnumber, group_av_peer_delete) == -1
|| callback_groupchat_delete(g_c, groupnumber, group_av_groupchat_delete) == -1) {
if (group_set_object(g_c, conference_number, group_av) == -1
|| callback_groupchat_peer_new(g_c, conference_number, group_av_peer_new) == -1
|| callback_groupchat_peer_delete(g_c, conference_number, group_av_peer_delete) == -1
|| callback_groupchat_delete(g_c, conference_number, group_av_groupchat_delete) == -1) {
kill_group_av(group_av);
return -1;
}

const int numpeers = group_number_peers(g_c, groupnumber, false);
const int numpeers = group_number_peers(g_c, conference_number, false);

if (numpeers < 0) {
kill_group_av(group_av);
return -1;
}

for (uint32_t i = 0; i < numpeers; ++i) {
group_av_peer_new(group_av, groupnumber, i);
group_av_peer_new(group_av, conference_number, i);
}

group_lossy_packet_registerhandler(g_c, GROUP_AUDIO_PACKET_ID, &handle_group_audio_packet);
Expand All @@ -489,46 +489,46 @@ int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t
* @retval 0 on success.
* @retval -1 on failure.
*/
int groupchat_disable_av(const Group_Chats *g_c, uint32_t groupnumber)
int groupchat_disable_av(const Group_Chats *g_c, uint32_t conference_number)
{
if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV) {
if (group_get_type(g_c, conference_number) != GROUPCHAT_TYPE_AV) {
return -1;
}

Group_AV *group_av = (Group_AV *)group_get_object(g_c, groupnumber);
Group_AV *group_av = (Group_AV *)group_get_object(g_c, conference_number);

if (group_av == nullptr) {
return -1;
}

const int numpeers = group_number_peers(g_c, groupnumber, false);
const int numpeers = group_number_peers(g_c, conference_number, false);

if (numpeers < 0) {
kill_group_av(group_av);
return -1;
}

for (uint32_t i = 0; i < numpeers; ++i) {
group_av_peer_delete(group_av, groupnumber, group_peer_get_object(g_c, groupnumber, i));
group_peer_set_object(g_c, groupnumber, i, nullptr);
group_av_peer_delete(group_av, conference_number, group_peer_get_object(g_c, conference_number, i));
group_peer_set_object(g_c, conference_number, i, nullptr);
}

kill_group_av(group_av);

if (group_set_object(g_c, groupnumber, nullptr) == -1
|| callback_groupchat_peer_new(g_c, groupnumber, nullptr) == -1
|| callback_groupchat_peer_delete(g_c, groupnumber, nullptr) == -1
|| callback_groupchat_delete(g_c, groupnumber, nullptr) == -1) {
if (group_set_object(g_c, conference_number, nullptr) == -1
|| callback_groupchat_peer_new(g_c, conference_number, nullptr) == -1
|| callback_groupchat_peer_delete(g_c, conference_number, nullptr) == -1
|| callback_groupchat_delete(g_c, conference_number, nullptr) == -1) {
return -1;
}

return 0;
}

/** Return whether A/V is enabled in the groupchat. */
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t groupnumber)
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t conference_number)
{
return group_get_object(g_c, groupnumber) != nullptr;
return group_get_object(g_c, conference_number) != nullptr;
}

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

if (groupnumber == -1) {
if (conference_number == -1) {
return -1;
}

if (groupchat_enable_av(log, tox, g_c, groupnumber, audio_callback, userdata) == -1) {
del_groupchat(g_c, groupnumber, true);
if (groupchat_enable_av(log, tox, g_c, conference_number, audio_callback, userdata) == -1) {
del_groupchat(g_c, conference_number, true);

Check warning on line 548 in toxav/groupav.c

View check run for this annotation

Codecov / codecov/patch

toxav/groupav.c#L548 

Added line #L548 was not covered by tests
return -1;
}

return groupnumber;
return conference_number;
}

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

if (groupnumber == -1) {
if (conference_number == -1) {
return -1;
}

if (groupchat_enable_av(log, tox, g_c, groupnumber, audio_callback, userdata) == -1) {
del_groupchat(g_c, groupnumber, true);
if (groupchat_enable_av(log, tox, g_c, conference_number, audio_callback, userdata) == -1) {
del_groupchat(g_c, conference_number, true);

Check warning on line 570 in toxav/groupav.c

View check run for this annotation

Codecov / codecov/patch

toxav/groupav.c#L570 

Added line #L570 was not covered by tests
return -1;
}

return groupnumber;
return conference_number;
}

/** @brief Send an encoded audio packet to the group chat.
*
* @retval 0 on success.
* @retval -1 on failure.
*/
static int send_audio_packet(const Group_Chats *g_c, uint32_t groupnumber, const uint8_t *packet, uint16_t length)
static int send_audio_packet(const Group_Chats *g_c, uint32_t conference_number, const uint8_t *packet, uint16_t length)
{
if (length == 0 || length > MAX_CRYPTO_DATA_SIZE - 1 - sizeof(uint16_t)) {
return -1;
}

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

Group_AV *const group_av = (Group_AV *)group_get_object(g_c, groupnumber);
Group_AV *const group_av = (Group_AV *)group_get_object(g_c, conference_number);

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

if (send_group_lossy_packet(g_c, groupnumber, data, plen) == -1) {
if (send_group_lossy_packet(g_c, conference_number, data, plen) == -1) {
return -1;
}

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

if (group_av == nullptr) {
return -1;
Expand Down Expand Up @@ -655,5 +655,5 @@ int group_send_audio(const Group_Chats *g_c, uint32_t groupnumber, const int16_t
return -1;
}

return send_audio_packet(g_c, groupnumber, encoded, size);
return send_audio_packet(g_c, conference_number, encoded, size);
}
12 changes: 6 additions & 6 deletions toxav/groupav.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#define GROUP_AUDIO_PACKET_ID 192

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

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

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

/** @brief Disable A/V in a groupchat.
*
* @retval 0 on success.
* @retval -1 on failure.
*/
int groupchat_disable_av(const Group_Chats *g_c, uint32_t groupnumber);
int groupchat_disable_av(const Group_Chats *g_c, uint32_t conference_number);

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

#endif // C_TOXCORE_TOXAV_GROUPAV_H
Loading

0 comments on commit 89957be

Please sign in to comment.