Skip to content

Commit

Permalink
astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
zugz committed Nov 14, 2020
1 parent d75d6e8 commit 4581dee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/chat_commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ void cmd_conference_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char
}
} else if (type == TOX_CONFERENCE_TYPE_AV) {
#ifdef AUDIO
conferencenum = toxav_join_av_groupchat(m, self->num, (const uint8_t *) conferencekey, length, audio_conference_callback, NULL);
conferencenum = toxav_join_av_groupchat(m, self->num, (const uint8_t *) conferencekey, length,
audio_conference_callback, NULL);

if (conferencenum == (uint32_t) -1) {
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Audio conference instance failed to initialize");
Expand Down
3 changes: 2 additions & 1 deletion src/conference.c
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ static bool conference_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
for (uint32_t i = 0; i < chat->num_peers; ++i) {
complete_strs[i] = (const char *) chat->name_list[i].pubkey_str;
}

diff = complete_line(self, complete_strs, chat->num_peers);
}

Expand Down Expand Up @@ -1094,7 +1095,7 @@ static ToxWindow *new_conference_chat(uint32_t conferencenum)
#define CONFAV_SAMPLES_PER_FRAME (CONFAV_SAMPLE_RATE * CONFAV_FRAME_DURATION / 1000)

void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum, const int16_t *pcm,
unsigned int samples, uint8_t channels, uint32_t sample_rate, void *userdata)
unsigned int samples, uint8_t channels, uint32_t sample_rate, void *userdata)
{
ConferencePeer *peer = peer_in_conference(conferencenum, peernum);

Expand Down
4 changes: 2 additions & 2 deletions src/conference.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
bool disable_conference_audio(Tox *tox, uint32_t conferencenum);
void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
sample_rate, void *userdata);
const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
sample_rate, void *userdata);

bool conference_mute_self(uint32_t conferencenum);
bool conference_mute_peer(const Tox *m, uint32_t conferencenum, uint32_t peernum);
Expand Down

0 comments on commit 4581dee

Please sign in to comment.