Fixed minor compilation issues

diff --git a/Source/OpenTK/Input/GamePadConfigurationDatabase.cs b/Source/OpenTK/Input/GamePadConfigurationDatabase.cs
index 6230922..292cd10 100644 (file)
--- a/Source/OpenTK/Input/GamePadConfigurationDatabase.cs
+++ b/Source/OpenTK/Input/GamePadConfigurationDatabase.cs
@@ -72,7 +72,7 @@ namespace OpenTK.Input
             Add("4d6963726f736f66742050432d6a6f79,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b13,rightx:a5,righty:a4,x:b1,y:b2,");
             Add("88880803000000000000504944564944,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b0,y:b3,");
             Add("4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,");
-            Add("25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,")
+            Add("25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,");
             Add("4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,");
 
             // Mac OS X

diff --git a/Source/OpenTK/Input/JoystickCapabilities.cs b/Source/OpenTK/Input/JoystickCapabilities.cs
index 6c32f40..b46b074 100644 (file)
--- a/Source/OpenTK/Input/JoystickCapabilities.cs
+++ b/Source/OpenTK/Input/JoystickCapabilities.cs
@@ -62,6 +62,15 @@ namespace OpenTK.Input
 
         #endregion
 
+        #region Internal Members
+
+        internal void SetIsConnected(bool value)
+        {
+            is_connected = value;
+        }
+
+        #endregion
+
         #region Public Members
 
         /// <summary>
@@ -105,7 +114,7 @@ namespace OpenTK.Input
         public override string ToString()
         {
             return String.Format(
-                "{{Axes: {0}; Buttons: {1}; Hats: {2}; IsConnected: {2}}}",
+                "{{Axes: {0}; Buttons: {1}; Hats: {2}; IsConnected: {3}}}",
                 AxisCount, ButtonCount, HatCount, IsConnected);
         }
 

diff --git a/Source/OpenTK/Platform/Common/Hid.cs b/Source/OpenTK/Platform/Common/Hid.cs
index fc0c432..33d5a12 100644 (file)
--- a/Source/OpenTK/Platform/Common/Hid.cs
+++ b/Source/OpenTK/Platform/Common/Hid.cs
@@ -145,6 +145,12 @@ namespace OpenTK.Platform.Common
         VendorDefinedStart = 0xFF00
     }
 
+    // Consumer electronic devices
+    enum HIDUsageCD
+    {
+        ACPan = 0x0238
+    }
+
     // Generic desktop usage
     enum HIDUsageGD : ushort
     {

diff --git a/Source/OpenTK/Platform/Windows/WinRawJoystick.cs b/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
index 67561bd..17ea66e 100644 (file)
--- a/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/Source/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -347,7 +347,7 @@ namespace OpenTK.Platform.Windows
                     }
                 }
 
-                return new JoystickCapabilities(axes, buttons, true);
+                return new JoystickCapabilities(axes, buttons, 0, true);
             }
             return new JoystickCapabilities();
         }

diff --git a/Source/OpenTK/Platform/Windows/XInputJoystick.cs b/Source/OpenTK/Platform/Windows/XInputJoystick.cs
index b3518ef..7cbe76b 100644 (file)
--- a/Source/OpenTK/Platform/Windows/XInputJoystick.cs
+++ b/Source/OpenTK/Platform/Windows/XInputJoystick.cs
@@ -99,7 +99,7 @@ namespace OpenTK.Platform.Windows
                 int buttons = TranslateButtons(xcaps.GamePad.Buttons);
                 int axes = TranslateAxes(ref xcaps.GamePad);
 
-                return new JoystickCapabilities(axes, buttons, true);
+                return new JoystickCapabilities(axes, buttons, 0, true);
             }
             return new JoystickCapabilities();
         }