diff options
Diffstat (limited to 'src/fruits')
| -rw-r--r-- | src/fruits/cmc/cmc.c | 4 | ||||
| -rw-r--r-- | src/fruits/sink/sink.c | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c index 7fd8691..89800f6 100644 --- a/src/fruits/cmc/cmc.c +++ b/src/fruits/cmc/cmc.c @@ -764,10 +764,10 @@ s32 main(s32 argc, char *argv[]) aki_event_loop_init(&c.loop); camu_client_init(&c.client, &c.loop, client_callback, &c); - camu_client_login(&c.client, al_str_c("andrew"), al_str_c("127.0.0.1"), TREE_PORT); + camu_client_login(&c.client, al_str_c("andrew"), TREE_SERVER_IP, TREE_PORT); camu_resource_client_init(&c.resource_client, &c.loop, resource_client_callback, &c); - camu_resource_client_connect(&c.resource_client, al_str_c("127.0.0.1"), TREE_RESOURCE_PORT); + camu_resource_client_connect(&c.resource_client, TREE_SERVER_IP, TREE_RESOURCE_PORT); aki_event_loop_run(&c.loop); diff --git a/src/fruits/sink/sink.c b/src/fruits/sink/sink.c index 939e0af..d20f7c4 100644 --- a/src/fruits/sink/sink.c +++ b/src/fruits/sink/sink.c @@ -1,8 +1,6 @@ #include <al/log.h> #include <aki/event_loop.h> -#include "../../codec/libav/common.h" - #include "../../mixer/audio_miniaudio.h" #include "../../screen/screen.h" @@ -12,8 +10,6 @@ #include "../../libsink/sink.h" #include "../../tree/common.h" -#include "../../shoki/src/search.h" - struct cmv { s32 quit; struct camu_screen scr; @@ -100,7 +96,6 @@ static u8 sink_callback(void *userdata, u8 op, u8 type, void *opaque) break; case CAMU_SINK_EXIT: camu_sink_close(&c->sink); - aki_event_loop_break(&c->loop); break; } return CAMU_SINK_OK; @@ -166,13 +161,16 @@ s32 wmain(s32 argc, wchar_t **argv) } c.renderer->render(c.renderer, &c.scr); - camu_mixer_init(&c.mixer, (struct camu_audio *)&audio_plugin_miniaudio); - c.mixer.audio->configure_stream(c.mixer.audio, NULL); + if (!camu_mixer_init(&c.mixer, (struct camu_audio *)&audio_plugin_miniaudio)) { + goto err; + } camu_sink_init(&c.sink, &c.loop, &c.mixer, c.renderer); c.sink.callback = sink_callback; c.sink.userdata = &c; - camu_sink_connect(&c.sink, al_str_c("127.0.0.1"), TREE_PORT); + if (!camu_sink_connect(&c.sink, TREE_SERVER_IP, TREE_PORT)) { + goto err; + } struct aki_thread thread0; aki_thread_create(&thread0, event_loop_thread, &c); |