mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-22 22:53:03 +01:00
astyle
This commit is contained in:
parent
d75d6e8b60
commit
4581dee4fc
@ -138,7 +138,8 @@ void cmd_conference_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char
|
|||||||
}
|
}
|
||||||
} else if (type == TOX_CONFERENCE_TYPE_AV) {
|
} else if (type == TOX_CONFERENCE_TYPE_AV) {
|
||||||
#ifdef AUDIO
|
#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) {
|
if (conferencenum == (uint32_t) -1) {
|
||||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Audio conference instance failed to initialize");
|
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Audio conference instance failed to initialize");
|
||||||
|
@ -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) {
|
for (uint32_t i = 0; i < chat->num_peers; ++i) {
|
||||||
complete_strs[i] = (const char *) chat->name_list[i].pubkey_str;
|
complete_strs[i] = (const char *) chat->name_list[i].pubkey_str;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff = complete_line(self, complete_strs, chat->num_peers);
|
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)
|
#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,
|
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);
|
ConferencePeer *peer = peer_in_conference(conferencenum, peernum);
|
||||||
|
|
||||||
|
@ -97,8 +97,8 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
|
|||||||
bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
|
bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
|
||||||
bool disable_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,
|
void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
|
||||||
const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
|
const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
|
||||||
sample_rate, void *userdata);
|
sample_rate, void *userdata);
|
||||||
|
|
||||||
bool conference_mute_self(uint32_t conferencenum);
|
bool conference_mute_self(uint32_t conferencenum);
|
||||||
bool conference_mute_peer(const Tox *m, uint32_t conferencenum, uint32_t peernum);
|
bool conference_mute_peer(const Tox *m, uint32_t conferencenum, uint32_t peernum);
|
||||||
|
Loading…
Reference in New Issue
Block a user