Merge pull request #8675 from hansemannn/TIMOB-24205-6_0_X

[TIMOB-24205] (6_0_X) iOS: Update Ti.Media precompile macros
tidev · Dec 14, 2016 · 7029e3a · 7029e3a
2 parents 3a09f98 + da4fea6
commit 7029e3a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/iphone/Classes/MediaModule.m b/iphone/Classes/MediaModule.m
@@ -192,11 +192,19 @@ -(NSString*)apiName
 MAKE_SYSTEM_UINT(AUDIO_FILEFORMAT_3GP2,kAudioFile3GP2Type);
 MAKE_SYSTEM_UINT(AUDIO_FILEFORMAT_AMR,kAudioFileAMRType);
 
-#if defined(USE_TI_MEDIAHASCAMERAPERMISSIONS) || defined(USE_TI_MEDIAHASAUDIOPERMISSIONS)
+#ifdef USE_TI_MEDIACAMERA_AUTHORIZATION_AUTHORIZED
 MAKE_SYSTEM_UINT(CAMERA_AUTHORIZATION_AUTHORIZED, AVAuthorizationStatusAuthorized);
+#endif
+#ifdef USE_TI_MEDIACAMERA_AUTHORIZATION_DENIED
 MAKE_SYSTEM_UINT(CAMERA_AUTHORIZATION_DENIED, AVAuthorizationStatusDenied);
+#endif
+#ifdef USE_TI_MEDIACAMERA_AUTHORIZATION_RESTRICTED
 MAKE_SYSTEM_UINT(CAMERA_AUTHORIZATION_RESTRICTED, AVAuthorizationStatusRestricted);
+#endif
+#ifdef USE_TI_MEDIACAMERA_AUTHORIZATION_NOT_DETERMINED
 MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(CAMERA_AUTHORIZATION_NOT_DETERMINED, AVAuthorizationStatusNotDetermined, @"Media.CAMERA_AUTHORIZATION_NOT_DETERMINED", @"5.2.0", @"Media.CAMERA_AUTHORIZATION_UNKNOWN");
+#endif
+#ifdef USE_TI_MEDIACAMERA_AUTHORIZATION_UNKNOWN
 MAKE_SYSTEM_UINT(CAMERA_AUTHORIZATION_UNKNOWN, AVAuthorizationStatusNotDetermined);
 #endif
 
@@ -224,13 +232,12 @@ -(NSString*)apiName
 MAKE_SYSTEM_STR(AUDIO_SESSION_CATEGORY_RECORD, AVAudioSessionCategoryRecord);
 MAKE_SYSTEM_STR(AUDIO_SESSION_CATEGORY_PLAY_AND_RECORD, AVAudioSessionCategoryPlayAndRecord);
 
-
 MAKE_SYSTEM_UINT(AUDIO_SESSION_OVERRIDE_ROUTE_NONE, AVAudioSessionPortOverrideNone);
 MAKE_SYSTEM_UINT(AUDIO_SESSION_OVERRIDE_ROUTE_SPEAKER, AVAudioSessionPortOverrideSpeaker);
 #endif
 
 //Constants for Camera
-#ifdef USE_TI_MEDIASHOWCAMERA
+#if defined(USE_TI_MEDIACAMERA_FRONT) || defined(USE_TI_MEDIACAMERA_REAR) || defined(USE_TI_MEDIACAMERA_FLASH_OFF) || defined(USE_TI_MEDIACAMERA_FLASH_AUTO) || defined(USE_TI_MEDIACAMERA_FLASH_ON)
 MAKE_SYSTEM_PROP(CAMERA_FRONT,UIImagePickerControllerCameraDeviceFront);
 MAKE_SYSTEM_PROP(CAMERA_REAR,UIImagePickerControllerCameraDeviceRear);
 

diff --git a/iphone/Classes/defines.h b/iphone/Classes/defines.h
@@ -163,3 +163,13 @@
 #define USE_TI_MEDIAMUSICPLAYER
 #define USE_TI_MEDIAVIDEOPLAYER
 #define USE_TI_MEDIASOUND
+#define USE_TI_MEDIACAMERA_AUTHORIZATION_AUTHORIZED
+#define USE_TI_MEDIACAMERA_AUTHORIZATION_DENIED
+#define USE_TI_MEDIACAMERA_AUTHORIZATION_RESTRICTED
+#define USE_TI_MEDIACAMERA_AUTHORIZATION_NOT_DETERMINED
+#define USE_TI_MEDIACAMERA_AUTHORIZATION_UNKNOWN
+#define USE_TI_MEDIACAMERA_FRONT
+#define USE_TI_MEDIACAMERA_REAR
+#define USE_TI_MEDIACAMERA_FLASH_OFF
+#define USE_TI_MEDIACAMERA_FLASH_AUTO
+#define USE_TI_MEDIACAMERA_FLASH_ON