Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-04-25 19:54:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some vi footer comments, rename new PRIVATE_* funcs to MacHaptic_*.

Browse Source
This commit is contained in:
Ryan C. Gordon 2014-02-05 01:02:09 -05:00
parent 7afbb8c377
commit 7f94268805
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/haptic/SDL_syshaptic.h
View File

@ -205,3 +205,6 @@ extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
* Returns 0 on success, -1 on error. * Returns 0 on success, -1 on error.
*/ */
extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic); extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
/* vi: set ts=4 sw=4 expandtab: */

6
src/haptic/darwin/SDL_syshaptic.c
View File

@ -173,7 +173,7 @@ SDL_SYS_HapticInit(void)
} }
while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) { while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
PRIVATE_MaybeAddDevice(device); MacHaptic_MaybeAddDevice(device);
/* always release as the AddDevice will retain IF it's a forcefeedback device */ /* always release as the AddDevice will retain IF it's a forcefeedback device */
IOObjectRelease(device); IOObjectRelease(device);
} }
@ -207,7 +207,7 @@ HapticByDevIndex(int device_index)
} }
int int
PRIVATE_MaybeAddDevice( io_object_t device ) MacHaptic_MaybeAddDevice( io_object_t device )
{ {
IOReturn result; IOReturn result;
CFMutableDictionaryRef hidProperties; CFMutableDictionaryRef hidProperties;
@ -283,7 +283,7 @@ PRIVATE_MaybeAddDevice( io_object_t device )
} }
int int
PRIVATE_MaybeRemoveDevice( io_object_t device ) MacHaptic_MaybeRemoveDevice( io_object_t device )
{ {
SDL_hapticlist_item *item; SDL_hapticlist_item *item;
SDL_hapticlist_item *prev = NULL; SDL_hapticlist_item *prev = NULL;

8
src/haptic/darwin/SDL_syshaptic_c.h
View File

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
int extern int MacHaptic_MaybeAddDevice( io_object_t device );
PRIVATE_MaybeAddDevice( io_object_t device ); extern int MacHaptic_MaybeRemoveDevice( io_object_t device );
/* vi: set ts=4 sw=4 expandtab: */
int
PRIVATE_MaybeRemoveDevice( io_object_t device );

6
src/joystick/darwin/SDL_sysjoystick.c
View File

@ -124,7 +124,7 @@ HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
recDevice *device = (recDevice *) refcon; recDevice *device = (recDevice *) refcon;
device->removed = 1; device->removed = 1;
#if SDL_HAPTIC_IOKIT #if SDL_HAPTIC_IOKIT
PRIVATE_MaybeRemoveDevice(device->ffservice); MacHaptic_MaybeRemoveDevice(device->ffservice);
#endif #endif
s_bDeviceRemoved = SDL_TRUE; s_bDeviceRemoved = SDL_TRUE;
} }
@ -139,7 +139,7 @@ void JoystickDeviceWasRemovedCallback( void * refcon, io_service_t service, natu
recDevice *device = (recDevice *) refcon; recDevice *device = (recDevice *) refcon;
device->removed = 1; device->removed = 1;
#if SDL_HAPTIC_IOKIT #if SDL_HAPTIC_IOKIT
PRIVATE_MaybeRemoveDevice(device->ffservice); MacHaptic_MaybeRemoveDevice(device->ffservice);
#endif #endif
s_bDeviceRemoved = SDL_TRUE; s_bDeviceRemoved = SDL_TRUE;
} }
@ -687,7 +687,7 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) { if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
device->ffservice = ioHIDDeviceObject; device->ffservice = ioHIDDeviceObject;
#if SDL_HAPTIC_IOKIT #if SDL_HAPTIC_IOKIT
PRIVATE_MaybeAddDevice(ioHIDDeviceObject); MacHaptic_MaybeAddDevice(ioHIDDeviceObject);
#endif #endif
} else { } else {
device->ffservice = 0; device->ffservice = 0;