Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 16:53:01 +01:00
Code Issues Projects Releases Wiki Activity

astyle

Browse Source
This commit is contained in:
zugz (tox) 2020-11-14 00:00:00 +00:00
parent d75d6e8b60
commit 4581dee4fc
No known key found for this signature in database
GPG Key ID: 6F2BDA289D04F249
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chat_commands.c
View File

@ -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");

3
src/conference.c
View File

@ -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);
}
@ -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);

4
src/conference.h
View File

@ -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);