[audioplayers] Update audioplayers to 6.1.0 (#763)

packages/audioplayers/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.1.0
+
+* Update audioplayers to 6.1.0.
+* Update audioplayers_platform_interface to 7.0.0.
+* Changed to create a player when AudioPlayer created.
+* Remove 'audio.onCurrentPosition' method event.
+
 ## 3.0.2
 
 * Update minimum Flutter and Dart version to 3.13 and 3.1.

packages/audioplayers/analysis_options.yaml

@@ -1,8 +1 @@
 include: package:flame_lint/analysis_options.yaml
-
-# The 'invariant_booleans' is a deprecated lint rule.
-# Remove the following lines when flame_lint package removes the rule
-# from its `analysis_options.yaml`.
-linter:
-  rules:
-    - invariant_booleans: false

packages/audioplayers/example/analysis_options.yaml

@@ -0,0 +1,5 @@
+include: package:flame_lint/analysis_options.yaml
+
+linter:
+  rules:
+    do_not_use_environment: false

packages/audioplayers/example/integration_test/audioplayers_test.dart

@@ -176,7 +176,7 @@ void main() {
       await player.play(AssetSource(_kAssetAudio));
       await started.future;
       await Future<void>.delayed(_kPlayDuration);
-      expect(count, greaterThanOrEqualTo(5));
+      expect(count, greaterThanOrEqualTo(2));
 
       await player.dispose();
     });

packages/audioplayers/example/lib/components/dlg.dart

@@ -39,19 +39,10 @@ class Dlg extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8.0),
-      ),
-      elevation: 0,
-      backgroundColor: Colors.white,
-      child: Container(
+      child: Padding(
         padding: const EdgeInsets.all(16.0),
-        child: contentBox(context),
+        child: child,
       ),
     );
   }
-
-  Widget contentBox(BuildContext context) {
-    return child;
-  }
 }

packages/audioplayers/example/lib/components/player_widget.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
 
+// This code is also used in the example.md. Please keep it up to date.
 class PlayerWidget extends StatefulWidget {
   final AudioPlayer player;
 
@@ -106,12 +107,12 @@ class _PlayerWidgetState extends State<PlayerWidget> {
           ],
         ),
         Slider(
-          onChanged: (v) {
+          onChanged: (value) {
             final duration = _duration;
             if (duration == null) {
               return;
             }
-            final position = v * duration.inMilliseconds;
+            final position = value * duration.inMilliseconds;
             player.seek(Duration(milliseconds: position.round()));
           },
           value: (_position != null &&
@@ -129,7 +130,6 @@ class _PlayerWidgetState extends State<PlayerWidget> {
                   : '',
           style: const TextStyle(fontSize: 16.0),
         ),
-        Text('State: ${_playerState ?? '-'}'),
       ],
     );
   }
@@ -159,10 +159,6 @@ class _PlayerWidgetState extends State<PlayerWidget> {
   }
 
   Future<void> _play() async {
-    final position = _position;
-    if (position != null && position.inMilliseconds > 0) {
-      await player.seek(position);
-    }
     await player.resume();
     setState(() => _playerState = PlayerState.playing);
   }

packages/audioplayers/example/lib/main.dart

@@ -15,6 +15,7 @@ const defaultPlayerCount = 4;
 
 typedef OnError = void Function(Exception exception);
 
+/// The app is deployed at: https://bluefireteam.github.io/audioplayers/
 void main() {
   runApp(const MaterialApp(home: _ExampleApp()));
 }

packages/audioplayers/example/lib/tabs/audio_context.dart

@@ -3,6 +3,7 @@ import 'package:audioplayers_tizen_example/components/cbx.dart';
 import 'package:audioplayers_tizen_example/components/drop_down.dart';
 import 'package:audioplayers_tizen_example/components/tab_content.dart';
 import 'package:audioplayers_tizen_example/components/tabs.dart';
+import 'package:audioplayers_tizen_example/utils.dart';
 import 'package:flutter/material.dart';
 
 class AudioContextTab extends StatefulWidget {
@@ -27,7 +28,7 @@ class AudioContextTabState extends State<AudioContextTab>
   AudioContextConfig audioContextConfig = AudioContextConfig();
 
   /// Set config for each platform individually
-  AudioContext audioContext = const AudioContext();
+  AudioContext audioContext = AudioContext();
 
   @override
   Widget build(BuildContext context) {
@@ -82,10 +83,15 @@ class AudioContextTabState extends State<AudioContextTab>
   }
 
   void updateConfig(AudioContextConfig newConfig) {
-    setState(() {
-      audioContextConfig = newConfig;
-      audioContext = audioContextConfig.build();
-    });
+    try {
+      final context = newConfig.build();
+      setState(() {
+        audioContextConfig = newConfig;
+        audioContext = context;
+      });
+    } on AssertionError catch (e) {
+      toast(e.message.toString());
+    }
   }
 
   void updateAudioContextAndroid(AudioContextAndroid contextAndroid) {
@@ -94,10 +100,15 @@ class AudioContextTabState extends State<AudioContextTab>
     });
   }
 
-  void updateAudioContextIOS(AudioContextIOS contextIOS) {
-    setState(() {
-      audioContext = audioContext.copy(iOS: contextIOS);
-    });
+  void updateAudioContextIOS(AudioContextIOS Function() buildContextIOS) {
+    try {
+      final context = buildContextIOS();
+      setState(() {
+        audioContext = audioContext.copy(iOS: context);
+      });
+    } on AssertionError catch (e) {
+      toast(e.message.toString());
+    }
   }
 
   Widget _genericTab() {
@@ -112,11 +123,13 @@ class AudioContextTabState extends State<AudioContextTab>
             audioContextConfig.copy(route: v),
           ),
         ),
-        Cbx(
-          'Duck Audio',
-          value: audioContextConfig.duckAudio,
-          ({value}) => updateConfig(
-            audioContextConfig.copy(duckAudio: value),
+        LabeledDropDown<AudioContextConfigFocus>(
+          label: 'Audio Focus',
+          key: const Key('audioFocus'),
+          options: {for (final e in AudioContextConfigFocus.values) e: e.name},
+          selected: audioContextConfig.focus,
+          onChange: (v) => updateConfig(
+            audioContextConfig.copy(focus: v),
           ),
         ),
         Cbx(
@@ -194,19 +207,20 @@ class AudioContextTabState extends State<AudioContextTab>
   Widget _iosTab() {
     final iosOptions = AVAudioSessionOptions.values.map(
       (option) {
-        final options = audioContext.iOS.options;
+        final options = {...audioContext.iOS.options};
         return Cbx(
           option.name,
           value: options.contains(option),
           ({value}) {
-            if (value ?? false) {
-              options.add(option);
-            } else {
-              options.remove(option);
-            }
-            updateAudioContextIOS(
-              audioContext.iOS.copy(options: options),
-            );
+            updateAudioContextIOS(() {
+              final iosContext = audioContext.iOS.copy(options: options);
+              if (value ?? false) {
+                options.add(option);
+              } else {
+                options.remove(option);
+              }
+              return iosContext;
+            });
           },
         );
       },
@@ -219,7 +233,7 @@ class AudioContextTabState extends State<AudioContextTab>
           options: {for (final e in AVAudioSessionCategory.values) e: e.name},
           selected: audioContext.iOS.category,
           onChange: (v) => updateAudioContextIOS(
-            audioContext.iOS.copy(category: v),
+            () => audioContext.iOS.copy(category: v),
           ),
         ),
         ...iosOptions,

packages/audioplayers/example/lib/tabs/controls.dart

@@ -159,7 +159,7 @@ class _ControlsTabState extends State<ControlsTab>
               txt: 'Custom',
               onPressed: () async {
                 dialog(
-                  SeekDialog(
+                  _SeekDialog(
                     value: modalInputSeek,
                     setValue: (it) => setState(() => modalInputSeek = it),
                     seekDuration: () => _seekDuration(
@@ -184,18 +184,17 @@ class _ControlsTabState extends State<ControlsTab>
   bool get wantKeepAlive => true;
 }
 
-class SeekDialog extends StatelessWidget {
+class _SeekDialog extends StatelessWidget {
   final VoidCallback seekDuration;
   final VoidCallback seekPercent;
   final void Function(String val) setValue;
   final String value;
 
-  const SeekDialog({
+  const _SeekDialog({
     required this.seekDuration,
     required this.seekPercent,
     required this.value,
     required this.setValue,
-    super.key,
   });
 
   @override
@@ -209,7 +208,7 @@ class SeekDialog extends StatelessWidget {
           onChange: setValue,
         ),
         Row(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Btn(
               txt: 'millis',
@@ -232,9 +231,9 @@ class SeekDialog extends StatelessWidget {
                 seekPercent();
               },
             ),
-            Btn(
-              txt: 'Cancel',
+            TextButton(
               onPressed: Navigator.of(context).pop,
+              child: const Text('Cancel'),
             ),
           ],
         ),

packages/audioplayers/example/lib/utils.dart

@@ -7,7 +7,7 @@ extension StateExt<T extends StatefulWidget> on State<T> {
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         content: Text(message, key: textKey),
-        duration: const Duration(milliseconds: 250),
+        duration: Duration(milliseconds: message.length * 25),
       ),
     );
   }

packages/audioplayers/example/pubspec.yaml

@@ -7,15 +7,15 @@ environment:
   flutter: ">=3.13.0"
 
 dependencies:
-  audioplayers: ^5.1.0
+  audioplayers: ^6.1.0
   audioplayers_tizen:
     path: ../
   collection: ^1.16.0
   file_picker: ^5.0.1
   flutter:
     sdk: flutter
-  http: ^0.13.6
-  path_provider: ^2.0.1
+  http: ">=0.13.1 <2.0.0"
+  path_provider: ^2.0.12
   path_provider_tizen:
     path: ../../path_provider/
   provider: ^6.0.5

packages/audioplayers/pubspec.yaml

@@ -16,7 +16,7 @@ flutter:
         fileName: audioplayers_tizen_plugin.h
 
 dependencies:
-  audioplayers_platform_interface: ^6.0.0
+  audioplayers_platform_interface: ^7.0.0
   flutter:
     sdk: flutter
 

packages/audioplayers/tizen/src/audio_player.cc

@@ -9,18 +9,18 @@
 
 AudioPlayer::AudioPlayer(const std::string &player_id,
                          PreparedListener prepared_listener,
-                         CurrentPositionListener current_position_listener,
                          DurationListener duration_listener,
                          SeekCompletedListener seek_completed_listener,
                          PlayCompletedListener play_completed_listener,
                          LogListener log_listener)
     : player_id_(player_id),
       prepared_listener_(prepared_listener),
-      current_position_listener_(current_position_listener),
       duration_listener_(duration_listener),
       seek_completed_listener_(seek_completed_listener),
       play_completed_listener_(play_completed_listener),
-      log_listener_(log_listener) {}
+      log_listener_(log_listener) {
+  CreatePlayer();
+}
 
 AudioPlayer::~AudioPlayer() { Release(); }
 
@@ -32,10 +32,6 @@ void AudioPlayer::Play() {
     return;
   }
 
-  if (state == PLAYER_STATE_NONE) {
-    CreatePlayer();
-  }
-
   switch (state) {
     case PLAYER_STATE_NONE:
     case PLAYER_STATE_IDLE: {
@@ -113,6 +109,7 @@ void AudioPlayer::Release() {
     ecore_timer_del(timer_);
     timer_ = nullptr;
   }
+  released_ = true;
 }
 
 void AudioPlayer::Seek(int32_t position) {
@@ -224,6 +221,16 @@ int AudioPlayer::GetDuration() {
 }
 
 int AudioPlayer::GetCurrentPosition() {
+  // TODO(jsuya) : When stop() or pause() is called in AudioPlayer 6.1.0,
+  // PositionUpdater's stopAndUpdate() is called. At this time, getPosition() is
+  // called, but in ReleaseMode, the player is released after Stop(), so an
+  // eception is thrown. Since there are differences from the implementation in
+  // the frontend package, an exception is not thrown in this case.
+  if (!player_ && released_ && release_mode_ == ReleaseMode::kRelease) {
+    LOG_ERROR("The player has already been released.");
+    return 0;
+  }
+
   int32_t position;
   int ret = player_get_play_position(player_, &position);
   if (ret != PLAYER_ERROR_NONE) {
@@ -263,6 +270,8 @@ void AudioPlayer::CreatePlayer() {
     throw AudioPlayerError("player_set_error_cb failed",
                            get_error_message(ret));
   }
+
+  released_ = false;
 }
 
 void AudioPlayer::PreparePlayer() {
@@ -434,8 +443,6 @@ Eina_Bool AudioPlayer::OnPositionUpdate(void *data) {
     if (player->IsPlaying()) {
       int32_t duration = player->GetDuration();
       player->duration_listener_(player->player_id_, duration);
-      int32_t position = player->GetCurrentPosition();
-      player->current_position_listener_(player->player_id_, position);
 
       return ECORE_CALLBACK_RENEW;
     }