Commit dca8c5ca authored by ldeluca's avatar ldeluca
Browse files

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media

parents 5a08d03d 40a60e0c

doc/index.md

+4 −4
Changes for doc/index.md: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -485,8 +485,8 @@ function when an error occurs. 


### Constants



- `MediaError.MEDIA_ERR_ABORTED`

- `MediaError.MEDIA_ERR_NETWORK`

- `MediaError.MEDIA_ERR_DECODE`

- `MediaError.MEDIA_ERR_NONE_SUPPORTED`

- `MediaError.MEDIA_ERR_ABORTED`        = 1

- `MediaError.MEDIA_ERR_NETWORK`        = 2

- `MediaError.MEDIA_ERR_DECODE`         = 3

- `MediaError.MEDIA_ERR_NONE_SUPPORTED` = 4

src/ios/CDVSound.m

+3 −0
Changes for src/ios/CDVSound.m: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -555,7 +555,10 @@ 
            }

            // get the audioSession and set the category to allow recording when device is locked or ring/silent switch engaged

            if ([self hasAudioSession]) {

                if (![self.avSession.category isEqualToString:AVAudioSessionCategoryPlayAndRecord]) {

                    [self.avSession setCategory:AVAudioSessionCategoryRecord error:nil];

                }



                if (![self.avSession setActive:YES error:&error]) {

                    // other audio with higher priority that does not allow mixing could cause this to fail

                    errorMsg = [NSString stringWithFormat:@"Unable to record audio: %@", [error localizedFailureReason]];