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-24325] (6_0_X) iOS: Fix build-issue when using Ti.Media #8770

Merged
merged 1 commit into from
Jan 23, 2017
Merged

[TIMOB-24325] (6_0_X) iOS: Fix build-issue when using Ti.Media #8770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions iphone/Classes/MediaModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,8 +1369,10 @@ -(void)destroyPicker
#ifdef USE_TI_MEDIAOPENMUSICLIBRARY
RELEASE_TO_NIL(musicPicker);
#endif
#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY) || defined(USE_TI_MEDIASTARTVIDEOEDITING)
#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY)
RELEASE_TO_NIL(picker);
#endif
#if defined(USE_TI_MEDIASTARTVIDEOEDITING) || defined(USE_TI_MEDIASTOPVIDEOEDITING)
RELEASE_TO_NIL(editor);
#endif
RELEASE_TO_NIL(pickerSuccessCallback);
Expand Down Expand Up @@ -1841,7 +1843,7 @@ -(void)saveCompletedForVideo:(NSString*)path error:(NSError*)error contextInfo:(
}
#endif

#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY) || defined(USE_TI_MEDIASTARTVIDEOEDITING) || defined(USE_TI_MEDIAOPENMUSICLIBRARY)
#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY) || defined(USE_TI_MEDIASTARTVIDEOEDITING)
-(void)handleTrimmedVideo:(NSURL*)theURL withDictionary:(NSDictionary*)dictionary
{
TiBlob* media = [[[TiBlob alloc] _initWithPageContext:[self pageContext] andFile:[theURL path]] autorelease];
Expand All @@ -1854,6 +1856,7 @@ -(void)handleTrimmedVideo:(NSURL*)theURL withDictionary:(NSDictionary*)dictionar

[self sendPickerSuccess:eventDict];
}
#endif

#pragma mark UIPopoverControllerDelegate
- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController
Expand Down Expand Up @@ -1928,6 +1931,7 @@ - (void)popoverPresentationControllerDidDismissPopover:(UIPopoverPresentationCon

#pragma mark UIImagePickerControllerDelegate

#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY)
- (void)imagePickerController:(UIImagePickerController *)picker_ didFinishPickingMediaWithInfo:(NSDictionary *)editingInfo
{
if (autoHidePicker) {
Expand Down Expand Up @@ -2136,7 +2140,7 @@ - (void)mediaPickerDidCancel:(MPMediaPickerController *)mediaPicker_

#pragma mark UIVideoEditorControllerDelegate

#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY) || defined(USE_TI_MEDIASTARTVIDEOEDITING)
#ifdef USE_TI_MEDIASTARTVIDEOEDITING
- (void)videoEditorController:(UIVideoEditorController *)editor_ didSaveEditedVideoToPath:(NSString *)editedVideoPath
{
id listener = [[editorSuccessCallback retain] autorelease];
Expand Down