@javascriptcommon/react-native-track-player 4.1.12 → 4.1.13

package/ios/RNTrackPlayer/RNTrackPlayer.swift

@@ -35,7 +35,7 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     private var hasInitialized = false
     private let player = QueuedAudioPlayer()
     private let audioSessionController = AudioSessionController.shared
-    private var equalizerTap: EqualizerAudioTap?
+    private let equalizerTap = EqualizerAudioTap()  // Always created, attached at setup
     private var shouldEmitProgressEvent: Bool = false
     private var shouldResumePlaybackAfterInterruptionEnds: Bool = false
     private var forwardJumpInterval: NSNumber? = nil;
@@ -135,11 +135,12 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
             return
         }
 
-        // configure the FFT audio tap
+        // configure the FFT audio tap if specified
         if let fftLength = config["useFFTProcessor"] as? Int {
             player.audioTap = WaveformAudioTap(mFFTLength: fftLength, mEmit: {data in
                 self.emit(event:EventType.FFTUpdated, body:data)})
         }
+        // Note: Equalizer tap is NOT attached by default. Call setEqualizerEnabled(true) to enable.
 
         // configure buffer size
         if let bufferDuration = config["minBuffer"] as? TimeInterval {
@@ -903,17 +904,9 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     public func setEqualizerEnabled(enabled: Bool, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        if enabled {
-            if equalizerTap == nil {
-                equalizerTap = EqualizerAudioTap()
-            }
-            equalizerTap?.isEnabled = true
-            player.audioTap = equalizerTap
-        } else {
-            equalizerTap?.isEnabled = false
-            player.audioTap = nil
-        }
-
+        // Toggle the enabled flag
+        // Note: For the equalizer to work, the tap must be attached to the player first
+        equalizerTap.isEnabled = enabled
         resolve(NSNull())
     }
 
@@ -921,20 +914,14 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     public func getEqualizerEnabled(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        let enabled = equalizerTap?.isEnabled ?? false
-        resolve(enabled)
+        resolve(equalizerTap.isEnabled)
     }
 
     @objc(setEqualizerBand:gain:resolver:rejecter:)
     public func setEqualizerBand(band: Int, gain: Float, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        if equalizerTap == nil {
-            equalizerTap = EqualizerAudioTap()
-            player.audioTap = equalizerTap
-        }
-
-        equalizerTap?.setGain(band: band, gainDB: gain)
+        equalizerTap.setGain(band: band, gainDB: gain)
         resolve(NSNull())
     }
 
@@ -942,13 +929,8 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     public func setEqualizerBands(gains: [NSNumber], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        if equalizerTap == nil {
-            equalizerTap = EqualizerAudioTap()
-            player.audioTap = equalizerTap
-        }
-
         let floatGains = gains.map { $0.floatValue }
-        equalizerTap?.setAllGains(floatGains)
+        equalizerTap.setAllGains(floatGains)
         resolve(NSNull())
     }
 
@@ -956,8 +938,7 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     public func getEqualizerBands(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        let gains = equalizerTap?.getAllGains() ?? Array(repeating: Float(0), count: 10)
-        resolve(gains)
+        resolve(equalizerTap.getAllGains())
     }
 
     @objc(getEqualizerFrequencies:rejecter:)
@@ -975,13 +956,8 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
             return
         }
 
-        if equalizerTap == nil {
-            equalizerTap = EqualizerAudioTap()
-            player.audioTap = equalizerTap
-        }
-
         let preset = presets[presetIndex]
-        equalizerTap?.applyPreset(preset)
+        equalizerTap.applyPreset(preset)
         resolve(NSNull())
     }
 
@@ -994,7 +970,7 @@ public class RNTrackPlayer: NSObject, AudioSessionControllerDelegate {
     public func resetEqualizer(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if (rejectWhenNotInitialized(reject: reject)) { return }
 
-        equalizerTap?.resetGains()
+        equalizerTap.resetGains()
         resolve(NSNull())
     }
 }

package/ios/RNTrackPlayer/TrackPlayer.mm

@@ -243,7 +243,45 @@ RCT_EXPORT_MODULE()
 - (void)setPlaybackState:(nonnull NSString *)mediaID resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 }
 
-- (void)switchExoPlayer:(double)fadeDuration fadeInterval:(double)fadeInterval fadeToVolume:(double)fadeToVolume waitUntil:(nonnull NSNumber *)waitUntil resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)switchExoPlayer:(double)fadeDuration fadeInterval:(double)fadeInterval fadeToVolume:(double)fadeToVolume waitUntil:(nonnull NSNumber *)waitUntil resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+}
+
+// iOS Equalizer methods
+
+- (void)setEqualizerEnabled:(BOOL)enabled resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer setEqualizerEnabled:enabled resolver:resolve rejecter:reject];
+}
+
+- (void)getEqualizerEnabled:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer getEqualizerEnabled:resolve rejecter:reject];
+}
+
+- (void)setEqualizerBand:(double)band gain:(double)gain resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer setEqualizerBand:(NSInteger)band gain:(float)gain resolver:resolve rejecter:reject];
+}
+
+- (void)setEqualizerBands:(nonnull NSArray *)gains resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer setEqualizerBands:gains resolver:resolve rejecter:reject];
+}
+
+- (void)getEqualizerBands:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer getEqualizerBands:resolve rejecter:reject];
+}
+
+- (void)getEqualizerFrequencies:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer getEqualizerFrequencies:resolve rejecter:reject];
+}
+
+- (void)applyEqualizerPreset:(double)presetIndex resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer applyEqualizerPreset:(NSInteger)presetIndex resolver:resolve rejecter:reject];
+}
+
+- (void)getEqualizerPresetNames:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer getEqualizerPresetNames:resolve rejecter:reject];
+}
+
+- (void)resetEqualizer:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [trackPlayer resetEqualizer:resolve rejecter:reject];
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javascriptcommon/react-native-track-player",
-  "version": "4.1.12",
+  "version": "4.1.13",
   "description": "A fully fledged audio module created for music apps",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",