bump audiomixing feature

bradmartin · bradmartin · commit 0598aa65360a · 2020-09-18T07:30:17.000-05:00
diff --git a/.prettierrc b/.prettierrc
@@ -1,7 +1,6 @@
 {
   "singleQuote": true,
   "semi": true,
-  "printWidth": 120,
   "trailingComma": "none",
   "arrowParens": "avoid"
 }
diff --git a/README.md b/README.md
@@ -19,10 +19,12 @@
 
 ## Installation
 
-NativeScript 7+:
-`tns plugin add nativescript-audio`
+#### NativeScript 7+:
+
+`ns plugin add nativescript-audio`
+
+#### NativeScript Version prior to 7:
 
-NativeScript Version prior to 7:
 `tns plugin add nativescript-audio@5.1.1`
 
 ---
@@ -136,10 +138,10 @@ const playerOptions = {
 
 player
   .playFromUrl(playerOptions)
-  .then(function (res) {
+  .then(res => {
     console.log(res);
   })
-  .catch(function (err) {
+  .catch(err => {
     console.log('something went wrong...', err);
   });
 ```
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
@@ -9,7 +9,12 @@ import {
   Slider,
   Utils
 } from '@nativescript/core';
-import { AudioPlayerOptions, AudioRecorderOptions, TNSPlayer, TNSRecorder } from 'nativescript-audio';
+import {
+  AudioPlayerOptions,
+  AudioRecorderOptions,
+  TNSPlayer,
+  TNSRecorder
+} from 'nativescript-audio';
 
 export class AudioDemo extends Observable {
   @ObservableProperty() public isPlaying: boolean;
@@ -80,7 +85,9 @@ export class AudioDemo extends Observable {
         androidEncoder = 3;
       }
 
-      const recordingPath = `${audioFolder.path}/recording.${this.platformExtension()}`;
+      const recordingPath = `${
+        audioFolder.path
+      }/recording.${this.platformExtension()}`;
 
       const recorderOptions: AudioRecorderOptions = {
         filename: recordingPath,
@@ -144,7 +151,9 @@ export class AudioDemo extends Observable {
   public getFile(args) {
     try {
       const audioFolder = knownFolders.currentApp().getFolder('audio');
-      const recordedFile = audioFolder.getFile(`recording.${this.platformExtension()}`);
+      const recordedFile = audioFolder.getFile(
+        `recording.${this.platformExtension()}`
+      );
       console.log(JSON.stringify(recordedFile));
       console.log('recording exists: ' + File.exists(recordedFile.path));
       this.recordedAudioFile = recordedFile.path;
@@ -155,7 +164,9 @@ export class AudioDemo extends Observable {
 
   public async playRecordedFile(args) {
     const audioFolder = knownFolders.currentApp().getFolder('audio');
-    const recordedFile = audioFolder.getFile(`recording.${this.platformExtension()}`);
+    const recordedFile = audioFolder.getFile(
+      `recording.${this.platformExtension()}`
+    );
     console.log('RECORDED FILE : ' + JSON.stringify(recordedFile));
 
     const playerOptions: AudioPlayerOptions = {
diff --git a/demo/package.json b/demo/package.json
@@ -5,11 +5,11 @@
     "@nativescript/core": "~7.0.0"
   },
   "devDependencies": {
-    "@nativescript/android": "7.0.0",
-    "@nativescript/ios": "7.0.0",
-    "@nativescript/types": "7.0.0",
+    "@nativescript/android": "~7.0.0",
+    "@nativescript/ios": "~7.0.0",
+    "@nativescript/types": "~7.0.0",
     "@nativescript/webpack": "~3.0.0",
-    "typescript": "^3.9.3"
+    "typescript": "~3.9.7"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "ci.base.setup": "npm i -g typescript@3.9.2 && echo no | npm i -g nativescript && tns usage-reporting disable && tns error-reporting disable && cd src && npm i && tsc",
+    "ci.base.setup": "npm i -g typescript@3.9.7 && echo no | npm i -g nativescript && tns usage-reporting disable && tns error-reporting disable && cd src && npm i && tsc",
     "ci.pip.install": "sudo pip install --upgrade pip && sudo pip install six",
     "ci.tslint": "cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint",
     "ci.vanilla.android.build": "cd demo && tns build android --env.uglify",
diff --git a/src/android/player.ts b/src/android/player.ts
@@ -4,9 +4,12 @@ import { AudioPlayerEvents, AudioPlayerOptions } from '../options';
 
 export enum AudioFocusDurationHint {
   AUDIOFOCUS_GAIN = android.media.AudioManager.AUDIOFOCUS_GAIN,
-  AUDIOFOCUS_GAIN_TRANSIENT = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
-  AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,
-  AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK
+  AUDIOFOCUS_GAIN_TRANSIENT = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT,
+  AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,
+  AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK
 }
 
 export class TNSPlayer implements TNSPlayerI {
@@ -17,7 +20,9 @@ export class TNSPlayer implements TNSPlayerI {
   private _durationHint: AudioFocusDurationHint;
   private _options: AudioPlayerOptions;
 
-  constructor(durationHint: AudioFocusDurationHint = AudioFocusDurationHint.AUDIOFOCUS_GAIN) {
+  constructor(
+    durationHint: AudioFocusDurationHint = AudioFocusDurationHint.AUDIOFOCUS_GAIN
+  ) {
     this._durationHint = durationHint;
   }
 
@@ -76,17 +81,15 @@ export class TNSPlayer implements TNSPlayerI {
           options.autoPlay = true;
         }
 
-        if (!this._player) {
-          this._player = new android.media.MediaPlayer();
-        }
-
         // request audio focus, this will setup the onAudioFocusChangeListener
         if (!options.audioMixing) {
           this._mAudioFocusGranted = this._requestAudioFocus();
         }
 
         const audioPath = resolveAudioFilePath(options.audioFile);
-        this._player.setAudioStreamType(android.media.AudioManager.STREAM_MUSIC);
+        this._player.setAudioStreamType(
+          android.media.AudioManager.STREAM_MUSIC
+        );
         this._player.reset();
         this._player.setDataSource(audioPath);
 
@@ -175,12 +178,17 @@ export class TNSPlayer implements TNSPlayerI {
           this._sendEvent(AudioPlayerEvents.started);
           // set volume controls
           // https://developer.android.com/reference/android/app/Activity.html#setVolumeControlStream(int)
-          Application.android.foregroundActivity.setVolumeControlStream(android.media.AudioManager.STREAM_MUSIC);
+          Application.android.foregroundActivity.setVolumeControlStream(
+            android.media.AudioManager.STREAM_MUSIC
+          );
 
           // register the receiver so when calls or another app takes main audio focus the player pauses
           Application.android.registerBroadcastReceiver(
             android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY,
-            (context: android.content.Context, intent: android.content.Intent) => {
+            (
+              context: android.content.Context,
+              intent: android.content.Intent
+            ) => {
               this.pause();
             }
           );
@@ -221,13 +229,19 @@ export class TNSPlayer implements TNSPlayerI {
     // this checks on API 23 and up
     if (android.os.Build.VERSION.SDK_INT >= 23 && this.play) {
       if (this._player?.isPlaying()) {
-        (this._player as any).setPlaybackParams((this._player as any).getPlaybackParams().setSpeed(speed));
+        (this._player as any).setPlaybackParams(
+          (this._player as any).getPlaybackParams().setSpeed(speed)
+        );
       } else {
-        (this._player as any).setPlaybackParams((this._player as any).getPlaybackParams().setSpeed(speed));
+        (this._player as any).setPlaybackParams(
+          (this._player as any).getPlaybackParams().setSpeed(speed)
+        );
         this._player?.pause();
       }
     } else {
-      console.warn('Android device API is not 23+. Cannot set the playbackRate on lower Android APIs.');
+      console.warn(
+        'Android device API is not 23+. Cannot set the playbackRate on lower Android APIs.'
+      );
     }
   }
 
@@ -241,7 +255,9 @@ export class TNSPlayer implements TNSPlayerI {
           // (Refer to: https://developer.android.com/reference/android/media/MediaPlayer#state-diagram)
           this._options = undefined;
           // unregister broadcast receiver
-          Application.android.unregisterBroadcastReceiver(android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+          Application.android.unregisterBroadcastReceiver(
+            android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY
+          );
 
           this._abandonAudioFocus();
         }
@@ -293,15 +309,19 @@ export class TNSPlayer implements TNSPlayerI {
     let result = true;
     if (!this._mAudioFocusGranted) {
       const ctx = this._getAndroidContext();
-      const am = ctx.getSystemService(android.content.Context.AUDIO_SERVICE) as android.media.AudioManager;
+      const am = ctx.getSystemService(
+        android.content.Context.AUDIO_SERVICE
+      ) as android.media.AudioManager;
       // Request audio focus for play back
       const focusResult = am.requestAudioFocus(
         this._mOnAudioFocusChangeListener,
         android.media.AudioManager.STREAM_MUSIC,
         this._durationHint
       );
 
-      if (focusResult === android.media.AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+      if (
+        focusResult === android.media.AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+      ) {
         result = true;
       } else {
         result = false;
@@ -388,36 +408,40 @@ export class TNSPlayer implements TNSPlayerI {
     return this._mediaPlayer;
   }
 
-  private _mOnAudioFocusChangeListener = new android.media.AudioManager.OnAudioFocusChangeListener({
-    onAudioFocusChange: (focusChange: number) => {
-      switch (focusChange) {
-        case android.media.AudioManager.AUDIOFOCUS_GAIN:
-          // Set volume level to desired levels
-          // if last volume more than 10 just set to 1.0 float
-          if (this._lastPlayerVolume && this._lastPlayerVolume >= 10) {
-            this.volume = 1.0;
-          } else if (this._lastPlayerVolume) {
-            this.volume = parseFloat('0.' + this._lastPlayerVolume.toString());
-          }
+  private _mOnAudioFocusChangeListener = new android.media.AudioManager.OnAudioFocusChangeListener(
+    {
+      onAudioFocusChange: (focusChange: number) => {
+        switch (focusChange) {
+          case android.media.AudioManager.AUDIOFOCUS_GAIN:
+            // Set volume level to desired levels
+            // if last volume more than 10 just set to 1.0 float
+            if (this._lastPlayerVolume && this._lastPlayerVolume >= 10) {
+              this.volume = 1.0;
+            } else if (this._lastPlayerVolume) {
+              this.volume = parseFloat(
+                '0.' + this._lastPlayerVolume.toString()
+              );
+            }
 
-          this.resume();
-          break;
-        case android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
-          // You have audio focus for a short time
-          break;
-        case android.media.AudioManager.AUDIOFOCUS_LOSS:
-          this.pause();
-          break;
-        case android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-          // Temporary loss of audio focus - expect to get it back - you can keep your resources around
-          this.pause();
-          break;
-        case android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
-          // Lower the volume, keep playing
-          this._lastPlayerVolume = this.volume;
-          this.volume = 0.2;
-          break;
+            this.resume();
+            break;
+          case android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
+            // You have audio focus for a short time
+            break;
+          case android.media.AudioManager.AUDIOFOCUS_LOSS:
+            this.pause();
+            break;
+          case android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+            // Temporary loss of audio focus - expect to get it back - you can keep your resources around
+            this.pause();
+            break;
+          case android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+            // Lower the volume, keep playing
+            this._lastPlayerVolume = this.volume;
+            this.volume = 0.2;
+            break;
+        }
       }
     }
-  });
+  );
 }
diff --git a/src/android/recorder.ts b/src/android/recorder.ts
@@ -12,7 +12,9 @@ export class TNSRecorder implements TNSRecordI {
 
   public static CAN_RECORD(): boolean {
     const pManager = Application.android.context.getPackageManager();
-    const canRecord = pManager.hasSystemFeature(android.content.pm.PackageManager.FEATURE_MICROPHONE);
+    const canRecord = pManager.hasSystemFeature(
+      android.content.pm.PackageManager.FEATURE_MICROPHONE
+    );
     if (canRecord) {
       return true;
     } else {
@@ -23,7 +25,9 @@ export class TNSRecorder implements TNSRecordI {
   public requestRecordPermission(explanation = '') {
     return new Promise(async (resolve, reject) => {
       try {
-        await requestPermission((android as any).Manifest.permission.RECORD_AUDIO).catch(err => {
+        await requestPermission(
+          (android as any).Manifest.permission.RECORD_AUDIO
+        ).catch(err => {
           reject(err);
         });
         resolve();
@@ -34,7 +38,9 @@ export class TNSRecorder implements TNSRecordI {
   }
 
   public hasRecordPermission() {
-    const permission = hasPermission((android as any).Manifest.permission.RECORD_AUDIO);
+    const permission = hasPermission(
+      (android as any).Manifest.permission.RECORD_AUDIO
+    );
     return !0 === permission ? !0 : !1;
   }
 
diff --git a/src/common.ts b/src/common.ts
@@ -120,7 +120,10 @@ export function resolveAudioFilePath(path: string) {
       let audioPath;
       let fileName = Utils.isString(path) ? path.trim() : '';
       if (fileName.indexOf('~/') === 0) {
-        fileName = nsFilePath.join(knownFolders.currentApp().path, fileName.replace('~/', ''));
+        fileName = nsFilePath.join(
+          knownFolders.currentApp().path,
+          fileName.replace('~/', '')
+        );
         audioPath = fileName;
       } else {
         audioPath = fileName;
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -354,21 +354,24 @@ export enum AudioFocusDurationHint {
    * playback to go back to where it was once your application no
    * longer requires audio focus.
    */
-  AUDIOFOCUS_GAIN_TRANSIENT = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
+  AUDIOFOCUS_GAIN_TRANSIENT = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT,
   /**
    * This focus request type is similar to AUDIOFOCUS_GAIN_TRANSIENT
    * for the temporary aspect of the focus request, but it also
    * expresses the fact during the time you own focus, you allow
    * another application to keep playing at a reduced volume,
    * “ducked”.
    */
-  AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,
+  AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,
   /**
    * Also for a temporary request, but also expresses that your
    * application expects the device to not play anything else. This
    * is typically used if you are doing audio recording or speech
    * recognition, and don’t want for examples notifications to be
    * played by the system during that time.
    */
-  AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE = android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK
+  AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE = android.media.AudioManager
+    .AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK
 }
diff --git a/src/ios/player.ts b/src/ios/player.ts
diff --git a/src/ios/recorder.ts b/src/ios/recorder.ts
diff --git a/src/package.json b/src/package.json
diff --git a/tslint.json b/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"singleQuote": true,`
`3`	`3`	`"semi": true,`
`4`		`- "printWidth": 120,`
`5`	`4`	`"trailingComma": "none",`
`6`	`5`	`"arrowParens": "avoid"`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"scripts": {`
`3`		`- "ci.base.setup": "npm i -g [email protected].2 && echo no \| npm i -g nativescript && tns usage-reporting disable && tns error-reporting disable && cd src && npm i && tsc",`
	`3`	`+ "ci.base.setup": "npm i -g [email protected].7 && echo no \| npm i -g nativescript && tns usage-reporting disable && tns error-reporting disable && cd src && npm i && tsc",`
`4`	`4`	`"ci.pip.install": "sudo pip install --upgrade pip && sudo pip install six",`
`5`	`5`	`"ci.tslint": "cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint",`
`6`	`6`	`"ci.vanilla.android.build": "cd demo && tns build android --env.uglify",`