(AVFoundation) Update

This commit is contained in:
twinaphex 2015-04-19 20:46:49 +02:00
parent 2580a2676a
commit d63774e51f
3 changed files with 6 additions and 6 deletions

View File

@ -630,7 +630,7 @@ camera_driver_t camera_apple = {
apple_camera_start,
apple_camera_stop,
apple_camera_poll,
"apple",
"avfoundation",
};
#endif

View File

@ -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

View File

@ -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;
}