Changeset 2563Tweet

Timestamp:

Mar 7, 2013, 12:33:49 PM (9 years ago)

Author:

sam

Message:

ps3: check for newly plugged pads at each frame.

File:

• trunk/src/platform/ps3/ps3input.cpp (modified) (2 diffs)

trunk/src/platform/ps3/ps3input.cpp

@@ -77 +77 @@
                                  CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010);
 
-    /* Try to detect connected pads. We should do this each frame. */
-    CellPadInfo2 pad_info2;
-    ret = cellPadGetInfo2(&pad_info2);
-    if (ret == CELL_PAD_OK)
-    {
-        for (int i = 0; i < NUM_PADS; i++)
-        {
-            if (!(pad_info2.port_status[i] & CELL_PAD_STATUS_CONNECTED))
-                continue;
-
-            Stick *stick = Input::CreateStick();
-            stick->SetAxisCount(4);
-            stick->SetButtonCount(16);
-            m_data->m_joysticks.Push(i, stick);
-        }
-    }
-
     m_data->mousepos = vec2(320.0f, 240.0f);
     m_data->mousebuttons = ivec3(0, 0, 0);
@@ -111 +94 @@
         return;
 
+    /* Try to detect newly connected pads. */
+    for (int i = 0; i < NUM_PADS; i++)
+    {
+        if (!(pad_info2.port_status[i] & CELL_PAD_STATUS_CONNECTED))
+            continue;
+
+        bool new_stick = true;
+        for (int j = 0; j < m_data->m_joysticks.Count(); ++j)
+            if (m_data->m_joysticks[j].m1 == i)
+                new_stick = false;
+
+        if (new_stick)
+        {
+            Stick *stick = Input::CreateStick();
+            stick->SetAxisCount(4);
+            stick->SetButtonCount(16);
+            m_data->m_joysticks.Push(i, stick);
+        }
+    }
+
+    /* Update pad status */
     for (int i = 0; i < m_data->m_joysticks.Count(); i++)
     {