Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Commented SDL_syshaptic.h.

Removed SDL_haptic_c.h (no private functions).
Fixed bug with SDL_HapticFromJoystick().
  • Loading branch information
bobbens committed Jul 2, 2008
1 parent dd591ee commit 8884a50e5e313e5a50f1b1fc9499de003910e631
Showing with 101 additions and 43 deletions.
  1. +1 −2 src/haptic/SDL_haptic.c
  2. +0 −34 src/haptic/SDL_haptic_c.h
  3. +100 −6 src/haptic/SDL_syshaptic.h
  4. +0 −1 src/haptic/linux/SDL_syshaptic.c
@@ -21,7 +21,6 @@
*/
#include "SDL_config.h"

#include "SDL_haptic_c.h"
#include "SDL_syshaptic.h"
#include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */

@@ -173,7 +172,7 @@ SDL_HapticOpenFromJoystick(SDL_Joystick * joystick)

/* Check to see if joystick's haptic is already open */
for (i=0; SDL_haptics[i]; i++) {
if (SDL_SYS_JoystickSameHaptic(&SDL_haptics[i],joystick)) {
if (SDL_SYS_JoystickSameHaptic(SDL_haptics[i],joystick)) {
haptic = SDL_haptics[i];
++haptic->ref_count;
return haptic;

This file was deleted.

@@ -47,22 +47,116 @@ struct _SDL_Haptic
int ref_count; /* Count for multiple opens */
};

/*
* Scans the system for haptic devices.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticInit(void);

/*
* Gets the device dependent name of the haptic device
*/
extern const char * SDL_SYS_HapticName(int index);

/*
* Opens the haptic device for usage. The haptic device should have
* the index value set previously.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticOpen(SDL_Haptic * haptic);

/*
* Checks to see if the joystick has haptic capabilities.
*
* Returns >0 if haptic capabilities are detected, 0 if haptic
* capabilities aren't detected and -1 on error.
*/
extern int SDL_JoystickIsHaptic(SDL_Joystick * joystick);

/*
* Opens the haptic device for usage using the same device as
* the joystick.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic,
SDL_Joystick * joystick);

/*
* Checks to see if haptic device and joystick device are the same.
*
* Returns 1 if they are the same, 0 if they aren't.
*/
extern int SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic,
SDL_Joystick * joystick);

/*
* Closes a haptic device after usage.
*/
extern void SDL_SYS_HapticClose(SDL_Haptic * haptic);

/*
* Performs a cleanup on the haptic subsystem.
*/
extern void SDL_SYS_HapticQuit(void);

/*
* Creates a new haptic effect on the haptic device using base
* as a template for the effect.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
struct haptic_effect * effect, SDL_HapticEffect * base);
struct haptic_effect * effect,
SDL_HapticEffect * base);

/*
* Updates the haptic effect on the haptic device using data
* as a template.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
struct haptic_effect * effect, SDL_HapticEffect * data);
struct haptic_effect * effect,
SDL_HapticEffect * data);

/*
* Runs the effect on the haptic device.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticRunEffect(SDL_Haptic * haptic,
struct haptic_effect * effect);
struct haptic_effect * effect);

/*
* Stops the effect on the haptic device.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticStopEffect(SDL_Haptic * haptic,
struct haptic_effect * effect);
struct haptic_effect * effect);

/*
* Cleanups up the effect on the haptic device.
*/
extern void SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic,
struct haptic_effect * effect);
struct haptic_effect * effect);

/*
* Sets the global gain of the haptic device.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain);
extern int SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter);

/*
* Sets the autocenter feature of the haptic device.
*
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic,
int autocenter);


@@ -24,7 +24,6 @@
#ifdef SDL_JOYSTICK_LINUX

#include "SDL_haptic.h"
#include "../SDL_haptic_c.h"
#include "../SDL_syshaptic.h"
#include "SDL_joystick.h"
#include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */

0 comments on commit 8884a50

Please sign in to comment.