Merge branch 'fix/background_event_lag' into minor

just_audio_background/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 0.0.1-beta.9
 
+* Fix currentIndex stutter.
 * Performance and lint fixes (@Zekfad).
 
 ## 0.0.1-beta.8

just_audio_background/README.md

@@ -2,7 +2,7 @@
 
 This package plugs into [just_audio](https://pub.dev/packages/just_audio) to add background playback support and remote controls (notification, lock screen, headset buttons, smart watches, Android Auto and CarPlay). It supports the simple use case where an app has a single `AudioPlayer` instance.
 
-If your app has more complex requirements, it is recommended that you instead use the [audio_service](https://pub.dev/packages/audio_service) package directly.
+If your app has more complex requirements, it is recommended that you instead use the [audio_service](https://pub.dev/packages/audio_service) package directly (which just_audio_background is internally built on). This will give you greater control over which buttons to display in the notification and how you want them to behave, while also allowing you to use multiple audio player instances.
 
 ## Setup
 
@@ -15,7 +15,7 @@ dependencies:
 
 ```
 
-Then add the following initialization code to your app's `main` method:
+Then add the following initialization code to your app's `main` method (refer to the API documentation for the complete set of options):
 
 ```dart
 Future<void> main() async {
@@ -91,6 +91,8 @@ Make the following changes to your project's `AndroidManifest.xml` file:
 
 Note: when targeting Android 12 or above, you must set `android:exported` on each component that has an intent filter (the main activity, the service and the receiver). If the manifest merging process causes `"Instantiable"` lint warnings, use `tools:ignore="Instantiable"` (as above) to suppress them.
 
+If your app has a requirement to use a FragmentActivity, you can replace `AudioServiceActivity` above with `AudioServiceFragmentActivity`. If your app needs to use a custom activity, you can also make your own activity class a subclass of either `AudioServiceActivity` or `AudioServiceFragmentActivity`. For more details on this and other options, refer to the [audio_service setup instructions](https://pub.dev/packages/audio_service).
+
 ## iOS setup
 
 Insert this in your `Info.plist` file:

just_audio_background/lib/just_audio_background.dart

@@ -160,7 +160,6 @@ class _JustAudioPlayer extends AudioPlayerPlatform {
   final eventController = StreamController<PlaybackEventMessage>.broadcast();
   final playerDataController = StreamController<PlayerDataMessage>.broadcast();
   bool? _playing;
-  int? _index;
   IcyMetadataMessage? _icyMetadata;
   int? _androidAudioSessionId;
   late final _PlayerAudioHandler _playerAudioHandler;
@@ -181,11 +180,6 @@ class _JustAudioPlayer extends AudioPlayerPlatform {
           _androidAudioSessionId = event['value'] as int?;
           broadcastPlaybackEvent();
           break;
-        case 'currentIndex':
-          _index = event['value'] as int?;
-          // The event is broadcast in response to the next mediaItem update
-          // which happens immediately after this.
-          break;
       }
     });
     _audioHandler.mediaItem.listen((mediaItem) {
@@ -218,7 +212,7 @@ class _JustAudioPlayer extends AudioPlayerPlatform {
       bufferedPosition: playbackState.bufferedPosition,
       icyMetadata: _icyMetadata,
       duration: _playerAudioHandler.currentMediaItem?.duration,
-      currentIndex: _index,
+      currentIndex: playbackState.queueIndex,
       androidAudioSessionId: _androidAudioSessionId,
     ));
     if (playbackState.playing != _playing) {
@@ -404,10 +398,6 @@ class _PlayerAudioHandler extends BaseAudioHandler
                   currentQueue![index!].copyWith(duration: track.duration);
               queue.add(currentQueue!);
             }
-            customEvent.add({
-              'type': 'currentIndex',
-              'value': track.index,
-            });
             mediaItem.add(currentMediaItem!);
           }
         });