diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index f4bd1c6..af49f62 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -31,8 +31,11 @@ set(COMPONENT_SRCS "weasel.c fifostream.c pdmain.c \ ../pd/src/x_gui.c \ ../pd/src/x_array.c \ ../pd/src/x_scalar.c \ +../pd/src/x_text.c \ +../pd/src/x_list.c \ ") + set(COMPONENT_ADD_INCLUDEDIRS ".") set(COMPONENT_ADD_CFLAGS "-DPD -DHAVE_UNISTD_H -DHAVE_ALLOCA_H \ diff --git a/main/pdmain.c b/main/pdmain.c index 1782a7c..11ca36f 100644 --- a/main/pdmain.c +++ b/main/pdmain.c @@ -143,15 +143,15 @@ void conf_init(void) x_connective_setup(); x_time_setup(); x_arithmetic_setup(); -#if POODLE x_array_setup(); x_misc_setup(); + x_qlist_setup(); x_gui_setup(); + x_list_setup(); x_scalar_setup(); d_global_setup(); d_soundfile_setup(); d_ugen_setup(); -#endif trymem(11); } @@ -1096,6 +1096,17 @@ int gpointer_check(const t_gpointer *gp, int headok) else return (0); } + /* copy a pointer to another, assuming the second one hasn't yet been + initialized. New gpointers should be initialized either by this + routine or by gpointer_init below. */ +void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto) +{ + *gpto = *gpfrom; + if (gpto->gp_stub) + gpto->gp_stub->gs_refcount++; + else bug("gpointer_copy"); +} + /* clear a gpointer that was previously set, releasing the associated gstub if this was the last reference to it. */ void gpointer_unset(t_gpointer *gp) diff --git a/main/weasel.c b/main/weasel.c index 6f2fab0..7ea0517 100644 --- a/main/weasel.c +++ b/main/weasel.c @@ -177,7 +177,6 @@ void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) } return; } - void audio_main(void) { audio_pipeline_handle_t pipeline; @@ -335,7 +334,6 @@ void app_main() esp_bt_gap_set_pin(pin_type, 0, pin_code); pdmain_init(); - audio_main(); }