summaryrefslogtreecommitdiff
path: root/toxav/toxav.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2016-09-12 21:37:58 +0100
committeriphydf <iphydf@users.noreply.github.com>2016-09-13 01:07:02 +0100
commita8823830d39bdbde8d4f4f34bfcb26dc4bf79741 (patch)
tree086d51b0db42c8fdbef669d002739f607db52f01 /toxav/toxav.c
parent0aa2840164fc782f150cd45f8668ca623e6002cf (diff)
Add some astyle options to make it do more.
It now enforces a bit more formatting. In particular, padding inside parentheses is removed. I would like it to remove padding after unary operators, but there seems to be no option for that.
Diffstat (limited to 'toxav/toxav.c')
-rw-r--r--toxav/toxav.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 9cb7be33..81476d32 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -89,7 +89,7 @@ struct ToxAV {
89 uint32_t interval; /** Calculated interval */ 89 uint32_t interval; /** Calculated interval */
90}; 90};
91 91
92void callback_bwc (BWController *bwc, uint32_t friend_number, float loss, void *user_data); 92void callback_bwc(BWController *bwc, uint32_t friend_number, float loss, void *user_data);
93 93
94int callback_invite(void *toxav_inst, MSICall *call); 94int callback_invite(void *toxav_inst, MSICall *call);
95int callback_start(void *toxav_inst, MSICall *call); 95int callback_start(void *toxav_inst, MSICall *call);
@@ -146,7 +146,7 @@ ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error)
146 goto END; 146 goto END;
147 } 147 }
148 148
149 av = calloc (sizeof(ToxAV), 1); 149 av = calloc(sizeof(ToxAV), 1);
150 150
151 if (av == NULL) { 151 if (av == NULL) {
152 LOGGER_WARNING(m->log, "Allocation failed!"); 152 LOGGER_WARNING(m->log, "Allocation failed!");
@@ -904,13 +904,13 @@ void callback_bwc(BWController *bwc, uint32_t friend_number, float loss, void *u
904 } 904 }
905 905
906 if (call->video_bit_rate) { 906 if (call->video_bit_rate) {
907 (*call->av->bcb.first) (call->av, friend_number, call->audio_bit_rate, 907 (*call->av->bcb.first)(call->av, friend_number, call->audio_bit_rate,
908 call->video_bit_rate - (call->video_bit_rate * loss), 908 call->video_bit_rate - (call->video_bit_rate * loss),
909 call->av->bcb.second); 909 call->av->bcb.second);
910 } else if (call->audio_bit_rate) { 910 } else if (call->audio_bit_rate) {
911 (*call->av->bcb.first) (call->av, friend_number, 911 (*call->av->bcb.first)(call->av, friend_number,
912 call->audio_bit_rate - (call->audio_bit_rate * loss), 912 call->audio_bit_rate - (call->audio_bit_rate * loss),
913 0, call->av->bcb.second); 913 0, call->av->bcb.second);
914 } 914 }
915 915
916 pthread_mutex_unlock(call->av->mutex); 916 pthread_mutex_unlock(call->av->mutex);
@@ -1079,7 +1079,7 @@ ToxAVCall *call_new(ToxAV *av, uint32_t friend_number, TOXAV_ERR_CALL *error)
1079 call->friend_number = friend_number; 1079 call->friend_number = friend_number;
1080 1080
1081 if (av->calls == NULL) { /* Creating */ 1081 if (av->calls == NULL) { /* Creating */
1082 av->calls = calloc (sizeof(ToxAVCall *), friend_number + 1); 1082 av->calls = calloc(sizeof(ToxAVCall *), friend_number + 1);
1083 1083
1084 if (av->calls == NULL) { 1084 if (av->calls == NULL) {
1085 free(call); 1085 free(call);