From cb70d0abbbe36f0d419470d828fa56c14070decf Mon Sep 17 00:00:00 2001 From: c vw Date: Tue, 1 Jun 2021 16:43:32 +0200 Subject: [PATCH] Prp. for merge --- iambic.c | 1 - main.c | 2 +- main.h | 9 +++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/iambic.c b/iambic.c index 5f43c3c..5709b2b 100644 --- a/iambic.c +++ b/iambic.c @@ -178,7 +178,6 @@ */ #include - #include #include #include diff --git a/main.c b/main.c index 8e094eb..ec18f8a 100644 --- a/main.c +++ b/main.c @@ -173,7 +173,7 @@ gboolean main_delete (GtkWidget *widget) { static int init(void *data) { char wisdom_directory[1024]; - fprintf(stderr,"init\n"); + g_print("%s\n",__FUNCTION__); audio_get_cards(); diff --git a/main.h b/main.h index 44b7eff..91bf17e 100644 --- a/main.h +++ b/main.h @@ -23,6 +23,15 @@ #include extern struct utsname unameData; +enum { + NO_CONTROLLER=0, + CONTROLLER1, + CONTROLLER2_V1, + CONTROLLER2_V2 +}; + +extern gint controller; + extern gint display_width; extern gint display_height; extern gint full_screen; -- 2.45.2