Skip to content

Commit 6afe48f

Browse files
LukashonakVLukashonakV
committed
happy linter
1 parent b18f382 commit 6afe48f

File tree

3 files changed

+53
-35
lines changed

3 files changed

+53
-35
lines changed

‎cava.c‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -696,36 +696,49 @@ Keys:\n\
696696
// in horizontal stereo mode we need to split the bars array in half
697697
// first half is right channel, second half is left channel
698698
for (int i = 0; i < audio_raw.number_of_bars / 2; i++) {
699-
audio_raw.right_bars[i] = audio_raw.bars[i + audio_raw.number_of_bars / 2];
700-
audio_raw.right_previous_frame[i] = audio_raw.previous_frame[i + audio_raw.number_of_bars / 2];
699+
audio_raw.right_bars[i] =
700+
audio_raw.bars[i + audio_raw.number_of_bars / 2];
701+
audio_raw.right_previous_frame[i] =
702+
audio_raw.previous_frame[i + audio_raw.number_of_bars / 2];
701703
}
702704
if (p.orientation == ORIENT_SPLIT_H) {
703-
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_BOTTOM,
704-
&p, &audio_raw);
705-
rc = draw_terminal_noncurses(audio_raw.right_bars, audio_raw.right_previous_frame,
705+
rc = draw_terminal_noncurses(audio_raw.bars,
706+
audio_raw.previous_frame,
707+
ORIENT_BOTTOM, &p, &audio_raw);
708+
rc = draw_terminal_noncurses(audio_raw.right_bars,
709+
audio_raw.right_previous_frame,
706710
ORIENT_TOP, &p, &audio_raw);
707711
}
708712
if (p.orientation == ORIENT_SPLIT_V) {
709-
rc = draw_terminal_noncurses(audio_raw.right_bars, audio_raw.right_previous_frame,
713+
rc = draw_terminal_noncurses(audio_raw.right_bars,
714+
audio_raw.right_previous_frame,
710715
ORIENT_LEFT, &p, &audio_raw);
711-
rc =
712-
draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_RIGHT, &p, &audio_raw);
716+
rc = draw_terminal_noncurses(audio_raw.bars,
717+
audio_raw.previous_frame,
718+
ORIENT_RIGHT, &p, &audio_raw);
713719
}
714720

715721
} else {
716722
// pure mirrored split, same bars for both sides
717723
if (p.orientation == ORIENT_SPLIT_H) {
718-
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_BOTTOM,
719-
&p, &audio_raw);
720-
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_TOP, &p, &audio_raw);
724+
rc = draw_terminal_noncurses(audio_raw.bars,
725+
audio_raw.previous_frame,
726+
ORIENT_BOTTOM, &p, &audio_raw);
727+
rc = draw_terminal_noncurses(audio_raw.bars,
728+
audio_raw.previous_frame,
729+
ORIENT_TOP, &p, &audio_raw);
721730
} else if (p.orientation == ORIENT_SPLIT_V) {
722-
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_LEFT, &p, &audio_raw);
723-
rc =
724-
draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, ORIENT_RIGHT, &p, &audio_raw);
731+
rc = draw_terminal_noncurses(audio_raw.bars,
732+
audio_raw.previous_frame,
733+
ORIENT_LEFT, &p, &audio_raw);
734+
rc = draw_terminal_noncurses(audio_raw.bars,
735+
audio_raw.previous_frame,
736+
ORIENT_RIGHT, &p, &audio_raw);
725737
}
726738
}
727739
} else {
728-
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame, p.orientation, &p, &audio_raw);
740+
rc = draw_terminal_noncurses(audio_raw.bars, audio_raw.previous_frame,
741+
p.orientation, &p, &audio_raw);
729742
}
730743
break;
731744
case OUTPUT_NCURSES:
@@ -749,8 +762,8 @@ Keys:\n\
749762
break;
750763
case OUTPUT_NORITAKE:
751764
#ifndef _WIN32
752-
rc = print_ntk_out(audio_raw.number_of_bars, audio_raw.fp, p.bit_format, p.bar_width,
753-
p.bar_spacing, p.bar_height, audio_raw.bars);
765+
rc = print_ntk_out(audio_raw.number_of_bars, audio_raw.fp, p.bit_format,
766+
p.bar_width, p.bar_spacing, p.bar_height, audio_raw.bars);
754767
#else
755768
rc = print_ntk_out(audio_raw.number_of_bars, p.hFile, p.bit_format, p.bar_width,
756769
p.bar_spacing, p.bar_height, audio_raw.bars);

‎include/cava/config.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ struct config_params {
7878
active, remix, virtual_node, samplerate, samplebits, channels, autoconnect, sleep_timer,
7979
live_config, sdl_width, sdl_height, sdl_x, sdl_y, sdl_full_screen, draw_and_quit, zero_test,
8080
non_zero_test, reverse, sync_updates, continuous_rendering, disable_blanking,
81-
show_idle_bar_heads, waveform, center_align, split_stereo, left_bottom, inAtty,
82-
inAterminal;
81+
show_idle_bar_heads, waveform, center_align, split_stereo, left_bottom, inAtty, inAterminal;
8382
#ifdef _WIN32
8483
HANDLE hFile;
8584
#endif

‎output/common.c‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int audio_raw_init(struct audio_data *audio, struct audio_raw *audio_raw, struct
4444
struct cava_plan **plan) {
4545
#ifndef _WIN32
4646
audio_raw->fp = -1;
47-
audio_raw->keepalive_fd =-1;
47+
audio_raw->keepalive_fd = -1;
4848
audio_raw->close_output_fd = false;
4949
#endif
5050
audio_raw->right_bars = NULL;
@@ -280,7 +280,8 @@ int audio_raw_init(struct audio_data *audio, struct audio_raw *audio_raw, struct
280280
audio_raw->number_of_bars *= 2;
281281
}
282282

283-
int raw_number_of_bars = (audio_raw->number_of_bars / audio_raw->output_channels) * (*plan)->audio_channels;
283+
int raw_number_of_bars =
284+
(audio_raw->number_of_bars / audio_raw->output_channels) * (*plan)->audio_channels;
284285
if (prm->waveform) {
285286
raw_number_of_bars = audio_raw->number_of_bars;
286287
}
@@ -328,12 +329,12 @@ int audio_raw_init(struct audio_data *audio, struct audio_raw *audio_raw, struct
328329
audio_raw->cava_out = (double *)malloc(audio_raw->number_of_bars * audio->channels /
329330
audio_raw->output_channels * sizeof(double));
330331
if (prm->split_stereo) {
331-
audio_raw->right_bars = (int *)malloc(audio_raw->number_of_bars * sizeof(int) + sizeof(int));
332-
audio_raw->right_previous_frame = (int *)malloc(audio_raw->number_of_bars * sizeof(int) + sizeof(int));
333-
memset(audio_raw->right_bars, 0,
334-
sizeof(int) * audio_raw->number_of_bars);
335-
memset(audio_raw->right_previous_frame, 0,
336-
sizeof(int) * audio_raw->number_of_bars);
332+
audio_raw->right_bars =
333+
(int *)malloc(audio_raw->number_of_bars * sizeof(int) + sizeof(int));
334+
audio_raw->right_previous_frame =
335+
(int *)malloc(audio_raw->number_of_bars * sizeof(int) + sizeof(int));
336+
memset(audio_raw->right_bars, 0, sizeof(int) * audio_raw->number_of_bars);
337+
memset(audio_raw->right_previous_frame, 0, sizeof(int) * audio_raw->number_of_bars);
337338
}
338339

339340
memset(audio_raw->bars, 0, sizeof(int) * audio_raw->number_of_bars);
@@ -485,21 +486,23 @@ int audio_raw_fetch(struct audio_raw *audio_raw, struct config_params *prm, int
485486
if (audio_raw->channels == 2) {
486487
if (prm->stereo) {
487488
// mirroring stereo channels
488-
if ((prm->orientation == ORIENT_SPLIT_H ||
489-
prm->orientation == ORIENT_SPLIT_V) &&
489+
if ((prm->orientation == ORIENT_SPLIT_H || prm->orientation == ORIENT_SPLIT_V) &&
490490
prm->split_stereo) {
491491
for (int n = 0; n < audio_raw->number_of_bars; n++) {
492492
if (n < audio_raw->number_of_bars / 2) {
493493
if (prm->reverse) {
494-
audio_raw->bars_raw[n] = audio_raw->bars_left[audio_raw->number_of_bars / 2 - n - 1];
494+
audio_raw->bars_raw[n] =
495+
audio_raw->bars_left[audio_raw->number_of_bars / 2 - n - 1];
495496
} else {
496497
audio_raw->bars_raw[n] = audio_raw->bars_left[n];
497498
}
498499
} else {
499500
if (prm->reverse) {
500-
audio_raw->bars_raw[n] = audio_raw->bars_right[audio_raw->number_of_bars - n - 1];
501+
audio_raw->bars_raw[n] =
502+
audio_raw->bars_right[audio_raw->number_of_bars - n - 1];
501503
} else {
502-
audio_raw->bars_raw[n] = audio_raw->bars_right[n - audio_raw->number_of_bars / 2];
504+
audio_raw->bars_raw[n] =
505+
audio_raw->bars_right[n - audio_raw->number_of_bars / 2];
503506
}
504507
}
505508
}
@@ -510,13 +513,16 @@ int audio_raw_fetch(struct audio_raw *audio_raw, struct config_params *prm, int
510513
if (prm->reverse) {
511514
audio_raw->bars_raw[n] = audio_raw->bars_left[n];
512515
} else {
513-
audio_raw->bars_raw[n] = audio_raw->bars_left[audio_raw->number_of_bars / 2 - n - 1];
516+
audio_raw->bars_raw[n] =
517+
audio_raw->bars_left[audio_raw->number_of_bars / 2 - n - 1];
514518
}
515519
} else {
516520
if (prm->reverse) {
517-
audio_raw->bars_raw[n] = audio_raw->bars_right[audio_raw->number_of_bars - n - 1];
521+
audio_raw->bars_raw[n] =
522+
audio_raw->bars_right[audio_raw->number_of_bars - n - 1];
518523
} else {
519-
audio_raw->bars_raw[n] = audio_raw->bars_right[n - audio_raw->number_of_bars / 2];
524+
audio_raw->bars_raw[n] =
525+
audio_raw->bars_right[n - audio_raw->number_of_bars / 2];
520526
}
521527
}
522528
}

0 commit comments

Comments
 (0)