diff --git a/apple/common/apple_cocoa_common.m b/apple/common/apple_cocoa_common.m index 2ff6fe9627..22d376025e 100644 --- a/apple/common/apple_cocoa_common.m +++ b/apple/common/apple_cocoa_common.m @@ -630,7 +630,7 @@ camera_driver_t camera_apple = { apple_camera_start, apple_camera_stop, apple_camera_poll, - "apple", + "avfoundation", }; #endif diff --git a/config.def.h b/config.def.h index c6d6cc9a17..b275755c84 100644 --- a/config.def.h +++ b/config.def.h @@ -111,7 +111,7 @@ enum CAMERA_V4L2, CAMERA_RWEBCAM, CAMERA_ANDROID, - CAMERA_APPLE, + CAMERA_AVFOUNDATION, CAMERA_NULL, LOCATION_ANDROID, @@ -293,8 +293,8 @@ enum #define CAMERA_DEFAULT_DRIVER CAMERA_RWEBCAM #elif defined(ANDROID) #define CAMERA_DEFAULT_DRIVER CAMERA_ANDROID -#elif defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) -#define CAMERA_DEFAULT_DRIVER CAMERA_APPLE +#elif defined(HAVE_AVFOUNDATION) +#define CAMERA_DEFAULT_DRIVER CAMERA_AVFOUNDATION #else #define CAMERA_DEFAULT_DRIVER CAMERA_NULL #endif diff --git a/configuration.c b/configuration.c index fa4bbd63e9..be7b4e907a 100644 --- a/configuration.c +++ b/configuration.c @@ -359,8 +359,8 @@ const char *config_get_default_camera(void) return "rwebcam"; case CAMERA_ANDROID: return "android"; - case CAMERA_APPLE: - return "apple"; + case CAMERA_AVFOUNDATION: + return "avfoundation"; default: break; }