diff --git a/core/.DS_Store b/core/.DS_Store index e827c27..f378fe4 100644 Binary files a/core/.DS_Store and b/core/.DS_Store differ diff --git a/core/build/.DS_Store b/core/build/.DS_Store index 4eb442f..1e445ce 100644 Binary files a/core/build/.DS_Store and b/core/build/.DS_Store differ diff --git a/core/build/apps/Crimata.app/Contents/MacOS/Crimata b/core/build/apps/Crimata.app/Contents/MacOS/Crimata deleted file mode 100755 index 70a3752..0000000 Binary files a/core/build/apps/Crimata.app/Contents/MacOS/Crimata and /dev/null differ diff --git a/core/build/objects/src/main.o b/core/build/objects/src/main.o index 6a20433..e7c13cd 100644 Binary files a/core/build/objects/src/main.o and b/core/build/objects/src/main.o differ diff --git a/core/makefile b/core/makefile index c47b8ef..4fc07d7 100644 --- a/core/makefile +++ b/core/makefile @@ -27,19 +27,18 @@ INCLUDE := \ -I ../gui/include/ \ -I ../networking/include/ \ -I ../audio/include/ \ - -I /usr/include/gtk-3.0 + -I /usr/include/gtk-3.0 \ SRC := \ $(wildcard src/main.c) \ $(wildcard ../gui/src/gtk-cairo_api.c) \ $(wildcard ../gui/src/anims.c) \ $(wildcard ../gui/src/eases.c) \ - $(wildcard ../networking/src/package_handler.c) \ $(wildcard ../audio/src/audio_handler.c) \ $(wildcard ../audio/src/frame_buffer.c) \ -OBJECTS := $(SRC:%.c=$(OBJ_DIR)/%.o) +OBJECTS := $(SRC:%.c=$(OBJ_DIR)/%.o) # Rules @@ -78,7 +77,7 @@ build: run: $(EXE_DIR)/$(APP_NAME) # remove object file directories rm -rvf $(BUILD_DIR)/audio $(BUILD_DIR)/gui $(BUILD_DIR)/networking -# $< + $< clean: diff --git a/core/src/main.c b/core/src/main.c index e1c24eb..67d0cfd 100644 --- a/core/src/main.c +++ b/core/src/main.c @@ -29,20 +29,19 @@ GObject *crimataAiBox; pthread_t drawing_thread; pthread_mutex_t mutex; -enum anim_e -{ BOUNCE_ANIM, STANDBY_ANIM }; +enum anim_e +{ + BOUNCE_ANIM, + STANDBY_ANIM +}; static char* user_id; -// static bool exit = false; - void * anim_handler () { - //! This will run indefinately, which is fine for the Version 0.1.0. - //! This anim will render any value that is at the mem loc of render_text. - print_anim (); + // start_up_anim (); - // while (!exit) //! Will return null once exit is true. + // while (!exit) // { // switch (current_anim) // { @@ -130,35 +129,39 @@ int main (int argc, char *argv[]) pthread_create(&_audio, NULL, (void *) init_audio, NULL); - gtk_init (&argc, &argv); + // gtk_init (&argc, &argv); - GError *error = NULL; - builder = gtk_builder_new (); - gtk_builder_add_from_file (builder, "../gui/src/window.ui", &error); + // GError *error = NULL; + // builder = gtk_builder_new (); + // gtk_builder_add_from_file (builder, "../gui/src/window.ui", &error); - /* Set up hooks for relevant UI elements. */ - homeWindow = gtk_builder_get_object (builder, "homeWindow"); - homeBox = gtk_builder_get_object (builder, "homeBox"); - crimataAiBox = gtk_builder_get_object (builder, "crimataAiBox"); + // /* Set up hooks for relevant UI elements. */ + // homeWindow = gtk_builder_get_object (builder, "homeWindow"); + // homeBox = gtk_builder_get_object (builder, "homeBox"); + // crimataAiBox = gtk_builder_get_object (builder, "crimataAiBox"); - /* Allocate area of window to have drawing functionality and set dims. */ - create_cairo_surface(crimataAiBox); + // /* Allocate area of window to have drawing functionality and set dims. */ + // create_cairo_surface(crimataAiBox); - /* CrimataAi animations */ - pthread_mutex_init (&mutex, NULL); - pthread_create (&drawing_thread, NULL, anim_handler, NULL); + // /* CrimataAi animations */ + // pthread_mutex_init (&mutex, NULL); + // pthread_create (&drawing_thread, NULL, anim_handler, NULL); - /* Create a timer to invalidate (refresh) crimataAiBox at 60Hz - ** Needs to only be called when crimataAiBox is showing. - */ - g_timeout_add (1000 / 60, invalidate_cb, (void *) crimataAiBox); + // /* Create a timer to invalidate (refresh) crimataAiBox at 60Hz + // ** Needs to only be called when crimataAiBox is showing. + // */ + // g_timeout_add (1000 / 60, invalidate_cb, (void *) crimataAiBox); - /* Assign UI opertaions using GTK singals */ - g_signal_connect (homeWindow, "destroy", G_CALLBACK (gtk_main_quit), NULL); - g_signal_connect (crimataAiBox, "draw", G_CALLBACK (drawing_area_draw_cb), NULL); - g_signal_connect (crimataAiBox, "configure-event", G_CALLBACK (resize_cairo_surface_cb), NULL); + // /* Assign UI opertaions using GTK singals */ + // g_signal_connect (homeWindow, "destroy", G_CALLBACK (gtk_main_quit), NULL); + // g_signal_connect (crimataAiBox, "draw", G_CALLBACK (drawing_area_draw_cb), NULL); + // g_signal_connect (crimataAiBox, "configure-event", G_CALLBACK (resize_cairo_surface_cb), NULL); - gtk_main(); + // gtk_main(); + + while (1) { + sleep(1); + } close_audio();