Commit 27596ea4 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

motion: Don't use unimotion on iOS.

parent 4598e488
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include "TargetConditionals.h"
#if !TARGET_OS_IPHONE
#define HAVE_MACOS_UNIMOTION
#endif
#endif
#ifdef HAVE_MACOS_UNIMOTION
#include "unimotion.h" #include "unimotion.h"
#endif #endif
...@@ -52,7 +59,7 @@ struct intf_sys_t ...@@ -52,7 +59,7 @@ struct intf_sys_t
{ {
enum { NO_SENSOR, HDAPS_SENSOR, AMS_SENSOR, APPLESMC_SENSOR, enum { NO_SENSOR, HDAPS_SENSOR, AMS_SENSOR, APPLESMC_SENSOR,
UNIMOTION_SENSOR } sensor; UNIMOTION_SENSOR } sensor;
#ifdef __APPLE__ #ifdef HAVE_MACOS_UNIMOTION
enum sms_hardware unimotion_hw; enum sms_hardware unimotion_hw;
#endif #endif
int i_calibrate; int i_calibrate;
...@@ -144,7 +151,7 @@ int Open ( vlc_object_t *p_this ) ...@@ -144,7 +151,7 @@ int Open ( vlc_object_t *p_this )
p_intf->p_sys->sensor = NO_SENSOR; p_intf->p_sys->sensor = NO_SENSOR;
} }
} }
#ifdef __APPLE__ #ifdef HAVE_MACOS_UNIMOTION
else if((p_intf->p_sys->unimotion_hw = detect_sms())) else if((p_intf->p_sys->unimotion_hw = detect_sms()))
p_intf->p_sys->sensor = UNIMOTION_SENSOR; p_intf->p_sys->sensor = UNIMOTION_SENSOR;
#endif #endif
...@@ -307,7 +314,7 @@ static int GetOrientation( intf_thread_t *p_intf ) ...@@ -307,7 +314,7 @@ static int GetOrientation( intf_thread_t *p_intf )
return ( i_x - p_intf->p_sys->i_calibrate ) * 10; return ( i_x - p_intf->p_sys->i_calibrate ) * 10;
#ifdef __APPLE__ #ifdef HAVE_MACOS_UNIMOTION
case UNIMOTION_SENSOR: case UNIMOTION_SENSOR:
if( read_sms_raw( p_intf->p_sys->unimotion_hw, &i_x, &i_y, &i_z ) ) if( read_sms_raw( p_intf->p_sys->unimotion_hw, &i_x, &i_y, &i_z ) )
{ {
......
...@@ -69,6 +69,13 @@ ...@@ -69,6 +69,13 @@
*/ */
#ifdef __APPLE__ #ifdef __APPLE__
#include "TargetConditionals.h"
#if !TARGET_OS_IPHONE
#define HAVE_MACOS_UNIMOTION
#endif
#endif
#ifdef HAVE_MACOS_UNIMOTION
#include "unimotion.h" #include "unimotion.h"
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment