From bcf48cb4d31ad96ecba0abc13a541e4d9ff483b5 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 9 Jul 2009 01:45:09 -0700
Subject: [PATCH] Added DEFAULT_SUBDEVICE and fixed number being created

---
 src/tuio.c | 5 +++--
 src/tuio.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tuio.c b/src/tuio.c
index 09aa6bb..ed2a22d 100644
--- a/src/tuio.c
+++ b/src/tuio.c
@@ -206,7 +206,8 @@ TuioPreInit(InputDriverPtr drv,
         pInfo->private = pTuio;
 
         /* Get the number of subdevices we need to create */
-        num_subdev = xf86CheckIntOption(dev->commonOptions, "SubDevices", 5); 
+        num_subdev = xf86CheckIntOption(dev->commonOptions, "SubDevices",
+                DEFAULT_SUBDEVICES); 
         if (num_subdev > MAX_SUBDEVICES) {
             num_subdev = MAX_SUBDEVICES;
         } else if (num_subdev < MIN_SUBDEVICES) {
@@ -368,7 +369,7 @@ TuioControl(DeviceIntPtr device,
 
             /* If this is a "core" device, create object devices */
             if (pTuio) {
-                _init_devices(pInfo, pTuio->num_subdev - 1);
+                _init_devices(pInfo, pTuio->num_subdev);
             }
             break;
 
diff --git a/src/tuio.h b/src/tuio.h
index 7a7ba8b..2160238 100644
--- a/src/tuio.h
+++ b/src/tuio.h
@@ -33,6 +33,7 @@
 
 #define MIN_SUBDEVICES 0 /* min/max subdevices */
 #define MAX_SUBDEVICES 20
+#define DEFAULT_SUBDEVICES 5
 
 #define DEFAULT_PORT 3333 /* Default UDP port to listen on */
 
-- 
2.11.4.GIT