Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a BJoystick::RescanDevices() public function. It allows the BJoystick

Browse Source 
to be updated with newly plugged in devices without the need to recreate a
  BJoystick object.
* Do an initial (re-)scan on object creation instead of always scanning in
  CountDevices() and by extension GetDeviceName().
* This makes CountDevices() and GetDeviceName() stable with regards to the
  device list, so that an enumerating application doesn't suddenly get more/less
  devices than it might expect.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41870 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-06-02 15:10:31 +00:00
parent a00ac73989
commit 464e0351d3
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/os/device/Joystick.h
View File

@ -41,6 +41,12 @@ public:
status_t GetDeviceName(int32 index, char* name,
size_t bufSize = B_OS_NAME_LENGTH);
status_t RescanDevices();
// Haiku extension. Updates the list of devices
// as enumerated by CountDevices() and
// GetDeviceName() with possibly newly plugged
// in devices.
bool EnterEnhancedMode(const entry_ref* ref = NULL);
int32 CountSticks();

26
src/kits/device/Joystick.cpp
View File

@ -68,6 +68,8 @@ BJoystick::BJoystick()
if (fJoystickInfo != NULL)
memset(fJoystickInfo, 0, sizeof(joystick_info));
RescanDevices();
}
@ -200,12 +202,10 @@ BJoystick::CountDevices()
{
CALLED();
// Refresh devices list
ScanDevices(true);
if (fDevices == NULL)
return 0;
int32 count = 0;
if (fDevices != NULL)
count = fDevices->CountItems();
int32 count = fDevices->CountItems();
LOG("Count = %d\n", count);
return count;
@ -219,8 +219,7 @@ BJoystick::GetDeviceName(int32 index, char *name, size_t bufSize)
if (fDevices == NULL)
return B_NO_INIT;
// CountDevices() also calls ScanDevices() and therefore updates our list.
if (index >= CountDevices())
if (index >= fDevices->CountItems())
return B_BAD_INDEX;
if (name == NULL)
@ -236,6 +235,19 @@ BJoystick::GetDeviceName(int32 index, char *name, size_t bufSize)
}
status_t
BJoystick::RescanDevices()
{
CALLED();
if (fDevices == NULL)
return B_NO_INIT;
ScanDevices(true);
return B_OK;
}
bool
BJoystick::EnterEnhancedMode(const entry_ref *ref)
{