mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-23 02:33:02 +01:00
added /bitrate
This commit is contained in:
parent
922c184195
commit
2ede39369a
@ -342,6 +342,7 @@ void audio_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, uint32_t audio_
|
|||||||
uint32_t video_bit_rate, void *user_data)
|
uint32_t video_bit_rate, void *user_data)
|
||||||
{
|
{
|
||||||
CallControl.audio_bit_rate = audio_bit_rate;
|
CallControl.audio_bit_rate = audio_bit_rate;
|
||||||
|
toxav_bit_rate_set(av, friend_number, audio_bit_rate, video_bit_rate, user_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void callback_recv_invite(Tox *m, uint32_t friend_number)
|
void callback_recv_invite(Tox *m, uint32_t friend_number)
|
||||||
@ -834,6 +835,55 @@ on_error:
|
|||||||
print_err (self, error_str);
|
print_err (self, error_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cmd_bitrate(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
|
||||||
|
{
|
||||||
|
char *error_str;
|
||||||
|
|
||||||
|
if ( argc != 1 ) {
|
||||||
|
error_str = "Must have value!";
|
||||||
|
goto on_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( self->is_call == false ) {
|
||||||
|
error_str = "Must be in a call";
|
||||||
|
goto on_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
const uint32_t bitrate = strtol(argv[1], NULL, 10);
|
||||||
|
|
||||||
|
TOXAV_ERR_BIT_RATE_SET error;
|
||||||
|
audio_bit_rate_status_cb(CallControl.av, self->num, bitrate, -1, &error);
|
||||||
|
|
||||||
|
if (error != TOXAV_ERR_BIT_RATE_SET_OK) {
|
||||||
|
switch (error) {
|
||||||
|
case TOXAV_ERR_BIT_RATE_SET_SYNC:
|
||||||
|
error_str = "Syncronization error occured";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TOXAV_ERR_BIT_RATE_SET_INVALID_AUDIO_BIT_RATE:
|
||||||
|
error_str = "Invalid audio bit rate value (valid is 6-510)";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TOXAV_ERR_BIT_RATE_SET_FRIEND_NOT_FOUND:
|
||||||
|
error_str = "Friend not found";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TOXAV_ERR_BIT_RATE_SET_FRIEND_NOT_IN_CALL:
|
||||||
|
error_str = "Friend is not in the call";
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
error_str = "Unknown error";
|
||||||
|
}
|
||||||
|
|
||||||
|
goto on_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
on_error:
|
||||||
|
print_err (self, error_str);
|
||||||
|
}
|
||||||
|
|
||||||
void stop_current_call(ToxWindow *self)
|
void stop_current_call(ToxWindow *self)
|
||||||
{
|
{
|
||||||
|
@ -66,9 +66,9 @@ static void kill_infobox(ToxWindow *self);
|
|||||||
#endif /* AUDIO */
|
#endif /* AUDIO */
|
||||||
|
|
||||||
#if defined(AUDIO) && defined(PYTHON)
|
#if defined(AUDIO) && defined(PYTHON)
|
||||||
#define AC_NUM_CHAT_COMMANDS 31
|
#define AC_NUM_CHAT_COMMANDS 32
|
||||||
#elif AUDIO
|
#elif AUDIO
|
||||||
#define AC_NUM_CHAT_COMMANDS 30
|
#define AC_NUM_CHAT_COMMANDS 31
|
||||||
#elif PYTHON
|
#elif PYTHON
|
||||||
#define AC_NUM_CHAT_COMMANDS 23
|
#define AC_NUM_CHAT_COMMANDS 23
|
||||||
#else
|
#else
|
||||||
@ -110,6 +110,7 @@ static const char chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
|
|||||||
{ "/mute" },
|
{ "/mute" },
|
||||||
{ "/sense" },
|
{ "/sense" },
|
||||||
{ "/video" },
|
{ "/video" },
|
||||||
|
{ "/bitrate" },
|
||||||
|
|
||||||
#endif /* AUDIO */
|
#endif /* AUDIO */
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@ void cmd_cancel(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZ
|
|||||||
void cmd_ccur_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
void cmd_ccur_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
||||||
void cmd_mute(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
void cmd_mute(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
||||||
void cmd_sense(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
void cmd_sense(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
||||||
|
void cmd_bitrate(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
|
||||||
#endif /* AUDIO */
|
#endif /* AUDIO */
|
||||||
|
|
||||||
#ifdef VIDEO
|
#ifdef VIDEO
|
||||||
|
@ -87,6 +87,7 @@ static struct cmd_func chat_commands[] = {
|
|||||||
{ "/hangup", cmd_hangup },
|
{ "/hangup", cmd_hangup },
|
||||||
{ "/mute", cmd_mute },
|
{ "/mute", cmd_mute },
|
||||||
{ "/sense", cmd_sense },
|
{ "/sense", cmd_sense },
|
||||||
|
{ "/bitrate", cmd_bitrate },
|
||||||
#endif /* AUDIO */
|
#endif /* AUDIO */
|
||||||
#ifdef VIDEO
|
#ifdef VIDEO
|
||||||
{ "/video", cmd_video },
|
{ "/video", cmd_video },
|
||||||
|
@ -242,6 +242,7 @@ static void help_draw_chat(ToxWindow *self)
|
|||||||
wprintw(win, " /sdev <type> <id> : Change active device\n");
|
wprintw(win, " /sdev <type> <id> : Change active device\n");
|
||||||
wprintw(win, " /mute <type> : Mute active device if in call\n");
|
wprintw(win, " /mute <type> : Mute active device if in call\n");
|
||||||
wprintw(win, " /sense <n> : VAD sensitivity threshold\n");
|
wprintw(win, " /sense <n> : VAD sensitivity threshold\n");
|
||||||
|
wprintw(win, " /bitrate <n> : Set the audio encoding bitrate\n");
|
||||||
#endif /* AUDIO */
|
#endif /* AUDIO */
|
||||||
|
|
||||||
#ifdef VIDEO
|
#ifdef VIDEO
|
||||||
@ -355,9 +356,9 @@ void help_onKey(ToxWindow *self, wint_t key)
|
|||||||
|
|
||||||
case 'c':
|
case 'c':
|
||||||
#ifdef VIDEO
|
#ifdef VIDEO
|
||||||
help_init_window(self, 22, 80);
|
help_init_window(self, 23, 80);
|
||||||
#elif AUDIO
|
#elif AUDIO
|
||||||
help_init_window(self, 19, 80);
|
help_init_window(self, 20, 80);
|
||||||
#else
|
#else
|
||||||
help_init_window(self, 10, 80);
|
help_init_window(self, 10, 80);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user