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

Moved _joystick_info definition to JoystickTweaker.h, since there is no point to keep it public. Removed default parameter in the second version of Open(), otherwise the two functions can't be used unambiguously. Should fix bug #2904

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28291 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-10-23 08:18:48 +00:00
parent d5de4fbb6c
commit 4cc3ec9fdd
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,21 +21,7 @@ class BString;
struct entry_ref;
struct _extended_joystick;
class _BJoystickTweaker;
typedef struct _joystick_info {
char module_name[64];
char controller_name[64];
int16 num_axes;
int16 num_buttons;
int16 num_hats;
uint32 num_sticks;
bool calibration_enable;
bigtime_t max_latency;
BList name_axis;
BList name_hat;
BList name_button;
// BList name_
} joystick_info;
struct _joystick_info;
/* -----------------------------------------------------------------------*/
class BJoystick {
@ -44,7 +30,7 @@ public:
virtual ~BJoystick();
status_t Open(const char *portName);
status_t Open(const char *portName, bool enter_enhanced = true);
status_t Open(const char *portName, bool enter_enhanced);
void Close(void);
status_t Update(void);
@ -84,7 +70,6 @@ virtual ~BJoystick();
/* NOTE: Buttons() are 1 == on */
uint32 ButtonValues(int32 for_stick = 0);
status_t GetButtonNameAt(int32 index, BString * out_name);
/* -----------------------------------------------------------------------*/
protected:

15
headers/private/device/JoystickTweaker.h
View File

@ -16,7 +16,20 @@
class BJoystick;
struct _joystick_info;
typedef struct _joystick_info {
char module_name[64];
char controller_name[64];
int16 num_axes;
int16 num_buttons;
int16 num_hats;
uint32 num_sticks;
bool calibration_enable;
bigtime_t max_latency;
BList name_axis;
BList name_hat;
BList name_button;
// BList name_
} joystick_info;
class _BJoystickTweaker {

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

@ -41,6 +41,7 @@ FILE *BJoystick::sLogFile = NULL;
#include "JoystickTweaker.h"
BJoystick::BJoystick()
:
fBeBoxMode(false),