diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2025-11-30 14:32:51 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2025-11-30 14:32:51 -0500 |
| commit | c8412bbedae0fce38db96833732e8ce904721e4c (patch) | |
| tree | 4611046186c714513d042966ce97825df0fecf9e /src/fruits/cmc | |
| parent | 0d6d13425015d78606232874498327cabcb0e4e2 (diff) | |
| download | camu-c8412bbedae0fce38db96833732e8ce904721e4c.tar.gz camu-c8412bbedae0fce38db96833732e8ce904721e4c.tar.bz2 camu-c8412bbedae0fce38db96833732e8ce904721e4c.zip | |
Build cleanup and fixes from sink testing
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/fruits/cmc')
| -rw-r--r-- | src/fruits/cmc/cmc.c | 8 | ||||
| -rw-r--r-- | src/fruits/cmc/meson.build | 4 | ||||
| -rw-r--r-- | src/fruits/cmc/ui/util/waveform.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c index 3d91ba6..f44f82f 100644 --- a/src/fruits/cmc/cmc.c +++ b/src/fruits/cmc/cmc.c @@ -6,8 +6,6 @@ #include "../../liana/list.h" #include "../../codec/packet_ext.h" -#include "../common.h" - #include "cmc.h" #include "ui/ui.h" @@ -281,9 +279,13 @@ s32 main(s32 argc, char *argv[]) camu_post_cache_init(&c.cache); al_array_init(c.searches); + str user = al_str_c("guest"); + char *CMC_USER = getenv("CMC_USER"); + if (CMC_USER) user = al_str_cr(CMC_USER); + c.client.callback = client_callback; c.client.userdata = &c; - if (!camu_client_login(&c.client, &al_str_c("andrew"), &c.loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT)) { + if (!camu_client_login(&c.client, &user, &c.loop, NNWT_SOCKET_TCP, &al_str_c("127.0.0.1"), CAMU_PORT)) { goto err; } diff --git a/src/fruits/cmc/meson.build b/src/fruits/cmc/meson.build index de6d335..bb9d38d 100644 --- a/src/fruits/cmc/meson.build +++ b/src/fruits/cmc/meson.build @@ -20,7 +20,7 @@ if use_tui endif if is_windows and not is_msvc - cmc_args += ['-static', '-static-libgcc', '-static-libstdc++', '-municode', '-mwindows'] + cmc_args += ['-static', '-static-libgcc', '-static-libstdc++', '-mwindows', '-municode'] endif -executable('cmc', cmc_src, dependencies: cmc_deps, link_args: cmc_args, install: true) +executable('cmc', cmc_src, dependencies: cmc_deps, c_args: cmc_args, link_args: cmc_args, install: true) diff --git a/src/fruits/cmc/ui/util/waveform.c b/src/fruits/cmc/ui/util/waveform.c index bed34b7..624069e 100644 --- a/src/fruits/cmc/ui/util/waveform.c +++ b/src/fruits/cmc/ui/util/waveform.c @@ -22,8 +22,8 @@ // extra: #f6ac7f, #F5F4FA, #5b524b // left channel: n == 0, right channel: n == 1. #define COLOR_FOR_PIXEL(n, rms) rms ? \ - n == 0 ? nn_htonl(0xE4CAAF99) : nn_htonl(0xFF928FFF) : \ - n == 0 ? nn_htonl(0xF4EAE099) : nn_htonl(0xBC615EFF) + n == 0 ? nn_htonl(0xe4caaf99) : nn_htonl(0xff928fff) : \ + n == 0 ? nn_htonl(0xf4eae099) : nn_htonl(0xbc615eff) // ss: current sample, ns: next sample. #define HIT_WAVE(low, high, ss, ns) \ |