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-24358] iOS: Fix Ti.Media audio-players on device #8806

Merged
merged 1 commit into from
Feb 9, 2017
Merged

[TIMOB-24358] iOS: Fix Ti.Media audio-players on device #8806

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions iphone/Classes/MediaModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "KrollCallback.h"
#import "TiMediaAudioSession.h"
#import "MediaPlayer/MediaPlayer.h"
#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)
#import "TiMediaMusicPlayer.h"
#endif
#import "TiViewProxy.h"
Expand Down Expand Up @@ -44,7 +44,7 @@
#endif

// Music players
#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)
TiMediaMusicPlayer* systemMusicPlayer;
TiMediaMusicPlayer* appMusicPlayer;
#endif
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/MediaModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ @implementation MediaModule
-(void)dealloc
{
[self destroyPicker];
#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)
RELEASE_TO_NIL(systemMusicPlayer);
RELEASE_TO_NIL(appMusicPlayer);
#endif
Expand Down Expand Up @@ -376,7 +376,7 @@ -(NSNumber*)VIDEO_CONTROL_HIDDEN
MAKE_SYSTEM_PROP(VIDEO_TIME_OPTION_EXACT,MPMovieTimeOptionExact);
#endif

#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)
-(TiMediaMusicPlayer*)systemMusicPlayer
{
if (systemMusicPlayer == nil) {
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiMediaMusicPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)

#import <Foundation/Foundation.h>
#import <MediaPlayer/MediaPlayer.h>
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiMediaMusicPlayer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
#ifdef USE_TI_MEDIAMUSICPLAYER
#if defined(USE_TI_MEDIASYSTEMMUSICPLAYER) || defined (USE_TI_MEDIAAPPMUSICPLAYER)
#import "TiMediaMusicPlayer.h"
#import "MediaModule.h"

Expand Down
2 changes: 2 additions & 0 deletions iphone/Classes/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@
#define USE_TI_MEDIASAVETOPHOTOGALLERY
#define USE_TI_MEDIASTARTVIDEOEDITING
#define USE_TI_MEDIASTOPVIDEOEDITING
#define USE_TI_MEDIASYSTEMMUSICPLAYER
#define USE_TI_MEDIAAPPMUSICPLAYER
#define USE_TI_MEDIAAUDIOPLAYER
#define USE_TI_MEDIAAUDIORECORDER
#define USE_TI_MEDIAMUSICPLAYER
Expand Down