Merge commit 'aae086cc650e42eec1eea8db28cd01fa868d7f90'
This commit is contained in:
29
external/toxcore/c-toxcore/toxav/groupav.h
vendored
29
external/toxcore/c-toxcore/toxav/groupav.h
vendored
@ -14,51 +14,50 @@
|
||||
#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.
|
||||
*
|
||||
* @return group number on success.
|
||||
* @return conference number on success.
|
||||
* @retval -1 on failure.
|
||||
*/
|
||||
int add_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, audio_data_cb *audio_callback, void *userdata);
|
||||
|
||||
/** @brief Join a AV group (you need to have been invited first).
|
||||
*
|
||||
* @return group number on success
|
||||
* @return conference number on success
|
||||
* @retval -1 on failure.
|
||||
*/
|
||||
int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t friendnumber, const uint8_t *data,
|
||||
int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t peer_number, const uint8_t *data,
|
||||
uint16_t length, audio_data_cb *audio_callback, void *userdata);
|
||||
|
||||
|
||||
/** @brief Send audio to the group chat.
|
||||
/** @brief Send audio to the conference.
|
||||
*
|
||||
* @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.
|
||||
/** @brief Enable A/V in a conference.
|
||||
*
|
||||
* @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.
|
||||
/** @brief Disable A/V in a conference.
|
||||
*
|
||||
* @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);
|
||||
/** Return whether A/V is enabled in the conference. */
|
||||
bool groupchat_av_enabled(const Group_Chats *g_c, uint32_t conference_number);
|
||||
|
||||
#endif // C_TOXCORE_TOXAV_GROUPAV_H
|
||||
#endif /* C_TOXCORE_TOXAV_GROUPAV_H */
|
||||
|
Reference in New Issue
Block a user