Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 03:26:45 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
mannol
2014-07-10 01:29:18 +02:00
parent cf8dda6b0d 1ce731471d
commit df676423a7
32 changed files with 614 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/audio_call.c
View File

@ -52,7 +52,7 @@
typedef struct _Call {
pthread_t ttid; /* Transmission thread id */
_Bool ttas, has_output; /* Transmission thread active status (0 - stopped, 1- running) */
int in_idx, out_idx;
uint32_t in_idx, out_idx;
pthread_mutex_t mutex;
} Call;
@ -97,7 +97,7 @@ void callback_peer_timeout ( int32_t call_index, void *arg );
int stop_transmission(int call_index);
void write_device_callback(ToxAv* av, int32_t call_index, int16_t* data, int size);
static void print_err (ToxWindow *self, uint8_t *error_str)
static void print_err (ToxWindow *self, char *error_str)
{
line_info_add(self, NULL, NULL, NULL, error_str, SYS_MSG, 0, 0);
}
@ -105,7 +105,7 @@ static void print_err (ToxWindow *self, uint8_t *error_str)
ToxAv *init_audio(ToxWindow *self, Tox *tox)
{
ASettins.cs = av_DefaultSettings;
ASettins.cs.max_video_height= ASettins.cs.max_video_width = 0;
ASettins.cs.max_video_height = ASettins.cs.max_video_width = 0;
ASettins.errors = ae_None;
@ -324,8 +324,8 @@ void callback_peer_timeout ( int32_t call_index, void* arg )
*/
void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
char msg[MAX_STR_SIZE];
char *error_str;
if (argc != 0) {
error_str = "Invalid syntax!";
@ -362,7 +362,7 @@ on_error:
void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t *error_str;
char *error_str;
if (argc != 0) {
error_str = "Invalid syntax!";
@ -393,7 +393,7 @@ on_error:
void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t *error_str;
char *error_str;
if (argc != 0) {
error_str = "Invalid syntax!";
@ -424,7 +424,7 @@ on_error:
void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t *error_str;
char *error_str;
if (argc != 0) {
error_str = "Invalid syntax!";
@ -453,7 +453,7 @@ on_error:
void cmd_cancel(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t *error_str;
char *error_str;
if (argc != 0) {
error_str = "Invalid syntax!";
@ -486,8 +486,8 @@ on_error:
void cmd_list_devices(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
char msg[MAX_STR_SIZE];
char *error_str;
if ( argc != 1 ) {
if ( argc < 1 ) error_str = "Type must be specified!";
@ -520,8 +520,8 @@ on_error:
/* This changes primary device only */
void cmd_change_device(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
char msg[MAX_STR_SIZE];
char *error_str;
if ( argc != 2 ) {
if ( argc < 1 ) error_str = "Type must be specified!";
@ -566,8 +566,8 @@ on_error:
void cmd_ccur_device(WINDOW * window, ToxWindow * self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
char msg[MAX_STR_SIZE];
char *error_str;
if ( argc != 2 ) {
if ( argc < 1 ) error_str = "Type must be specified!";
@ -635,8 +635,8 @@ void cmd_ccur_device(WINDOW * window, ToxWindow * self, Tox *m, int argc, char (
void cmd_mute(WINDOW * window, ToxWindow * self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
char msg[MAX_STR_SIZE];
char *error_str;
if ( argc != 1 ) {
if ( argc < 1 ) error_str = "Type must be specified!";
@ -682,9 +682,8 @@ void cmd_mute(WINDOW * window, ToxWindow * self, Tox *m, int argc, char (*argv)[
}
void cmd_sense(WINDOW * window, ToxWindow * self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t msg[MAX_STR_SIZE];
uint8_t *error_str;
{
char *error_str;
if ( argc != 1 ) {
if ( argc < 1 ) error_str = "Must have value!";
@ -735,4 +734,4 @@ void stop_current_call(ToxWindow* self)
break;
}
}
}
}