Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-24205] (6_0_X) iOS: Update Ti.Media precompile macros #8675

Merged
merged 2 commits into from
Dec 14, 2016
Merged

[TIMOB-24205] (6_0_X) iOS: Update Ti.Media precompile macros #8675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ed02dd
[TIMOB-24205] Update Ti.Media precompile macros
hansemannn Dec 9, 2016
da4fea6
[TIMOB-24205] Update defines.h macros
hansemannn Dec 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions iphone/Classes/MediaModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);

Expand Down
10 changes: 10 additions & 0 deletions iphone/Classes/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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