Prp. for merge

diff --git a/iambic.c b/iambic.c
index 5f43c3c232510be61cc07545c623cc035ccc745e..5709b2b89bac0182ce2bf5109de54c38ca2480cc 100644 (file)
--- a/iambic.c
+++ b/iambic.c
@@ -178,7 +178,6 @@
  */
 
 #include <gtk/gtk.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/main.c b/main.c
index 8e094ebfc07e5445f7461f66e208d543050b6d92..ec18f8ac783511830d836f9d127060f8a7656bdc 100644 (file)
--- 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 44b7eff3cf53718feb4177ddde2253f1dc86fa7c..91bf17eadcf0d7349c351d6fc10019e72583e925 100644 (file)
--- a/main.h
+++ b/main.h
@@ -23,6 +23,15 @@
 #include <sys/utsname.h>
 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;