flet-audio 1.0.4__tar.gz → 1.1.0.dev0__tar.gz

{flet_audio-1.0.4/src/flet_audio.egg-info → flet_audio-1.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-audio
-Version: 1.0.4
+Version: 1.1.0.dev0
 Summary: Provides audio integration and playback in Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev0
 Dynamic: license-file
 
 # flet-audio

{flet_audio-1.0.4 → flet_audio-1.1.0.dev0}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-audio"
-version = "1.0.4"
+version = "1.1.0.dev0"
 description = "Provides audio integration and playback in Flet apps."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==1.0.4",
+    "flet==1.1.0.dev0",
 ]
 
 [project.urls]

{flet_audio-1.0.4 → flet_audio-1.1.0.dev0}/src/flet_audio/audio.py

@@ -24,6 +24,11 @@ class Audio(ft.Service):
     - A base64 string;
     - Raw bytes.
 
+    It can be left unset and assigned later, e.g. once the user picks a file.
+    While it is unset, :meth:`~flet_audio.Audio.play`,
+    :meth:`~flet_audio.Audio.resume` and :meth:`~flet_audio.Audio.seek` raise an
+    error.
+
     Note:
         [Here](https://github.com/bluefireteam/audioplayers/blob/main/troubleshooting.md#supported-formats--encodings)
             is a list of supported audio formats.

{flet_audio-1.0.4 → flet_audio-1.1.0.dev0/src/flet_audio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-audio
-Version: 1.0.4
+Version: 1.1.0.dev0
 Summary: Provides audio integration and playback in Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev0
 Dynamic: license-file
 
 # flet-audio

flet_audio-1.1.0.dev0/src/flet_audio.egg-info/requires.txt

@@ -0,0 +1 @@
+flet==1.1.0.dev0

{flet_audio-1.0.4 → flet_audio-1.1.0.dev0}/src/flutter/flet_audio/lib/src/audio.dart

@@ -24,6 +24,12 @@ class AudioService extends FletService {
   double? _balance;
   double? _playbackRate;
 
+  /// Incremented whenever the source is set, cleared or the service is
+  /// disposed, so that an [update] that is still preparing an earlier source
+  /// can tell that it was superseded.
+  int _sourceVersion = 0;
+  Future<void> _sourcePreparation = Future<void>.value();
+
   @override
   void init() {
     super.init();
@@ -61,44 +67,75 @@ class AudioService extends FletService {
     update();
   }
 
+  /// Applies the control's properties to [player].
+  ///
+  /// A missing or empty `src` means there is no source yet, e.g. until the
+  /// user picks a file: the other properties are still applied, and playback
+  /// of a source set earlier stops.
+  ///
+  /// The player is paused rather than released: the web player keeps the URL
+  /// of a released source and skips loading it again, so setting the same
+  /// `src` again would leave nothing to play.
+  ///
+  /// When `src` changes again while a source is still being prepared, the
+  /// earlier preparation neither triggers `loaded` nor starts autoplay.
+  ///
+  /// Volume, balance and playback rate are applied again after a new source
+  /// is loaded, and before `loaded` is triggered, since loading can reset
+  /// them: a web media element resets its playback rate when it loads.
+  ///
+  /// Settings, `autoplay` included, are read from the control when they are
+  /// applied, not when [update] is called, so an update that finishes loading
+  /// a source after a later update never applies outdated values.
   @override
   void update() {
     debugPrint("Audio(${control.id}).update: ${control.properties}");
 
-    final resolvedSrc = control.getSrc("src");
+    final resolvedSrc = control.get("src") != null
+        ? control.getSrc("src")
+        : const ResolvedAssetSource();
     if (resolvedSrc.error != null) {
       throw Exception("Audio src decode error: ${resolvedSrc.error}");
     }
-    if (resolvedSrc.isEmpty) {
-      throw Exception("Audio must have \"src\" specified.");
-    }
-    var autoplay = control.getBool("autoplay", false)!;
-    var volume = control.getDouble("volume", 1.0)!;
-    var balance = control.getDouble("balance", 0.0)!;
-    var playbackRate = control.getDouble("playback_rate", 1)!;
-    var releaseMode = parseReleaseMode(control.getString("release_mode"));
-
     () async {
       bool srcChanged = false;
-      // URL or file
-      if (resolvedSrc.uri != null && resolvedSrc.uri != _src) {
+      if (resolvedSrc.isEmpty) {
+        // no source
+        if (_hasSource) {
+          _src = null;
+          _srcBytes = null;
+          _sourceVersion++;
+          await player.pause();
+        }
+      } else if (resolvedSrc.uri != null && resolvedSrc.uri != _src) {
+        // URL or file
         _src = resolvedSrc.uri;
         _srcBytes = null;
         srcChanged = true;
-        await _applySource();
       } else if (resolvedSrc.bytes != null &&
           (_srcBytes == null || !listEquals(_srcBytes, resolvedSrc.bytes))) {
         // bytes
         _srcBytes = resolvedSrc.bytes;
         _src = null;
         srcChanged = true;
-        await _applySource();
       }
 
+      final sourceVersion = srcChanged ? ++_sourceVersion : _sourceVersion;
       if (srcChanged) {
-        control.triggerEvent("loaded");
+        try {
+          await _applySource();
+        } catch (_) {
+          if (sourceVersion != _sourceVersion) return;
+          rethrow;
+        }
+        if (sourceVersion != _sourceVersion) return;
+        _volume = null;
+        _balance = null;
+        _playbackRate = null;
       }
 
+      final releaseMode = parseReleaseMode(control.getString("release_mode"));
+
       // releaseMode
       if (releaseMode != null && releaseMode != _releaseMode) {
         _releaseMode = releaseMode;
@@ -106,51 +143,82 @@ class AudioService extends FletService {
       }
 
       // volume
+      final volume = control.getDouble("volume", 1.0)!;
       if (volume != _volume && volume >= 0 && volume <= 1) {
         _volume = volume;
         await player.setVolume(volume);
       }
 
       // playbackRate
+      final playbackRate = control.getDouble("playback_rate", 1)!;
       if (playbackRate != _playbackRate) {
         _playbackRate = playbackRate;
         await player.setPlaybackRate(playbackRate);
       }
 
       // balance
+      final balance = control.getDouble("balance", 0.0)!;
       if (!kIsWeb && balance != _balance && balance >= -1 && balance <= 1) {
         _balance = balance;
         await player.setBalance(balance);
       }
 
-      // autoplay
-      if (srcChanged && autoplay) {
-        await player.resume();
+      if (srcChanged && sourceVersion == _sourceVersion) {
+        control.triggerEvent("loaded");
+        if (control.getBool("autoplay", false)!) {
+          await player.resume();
+        }
       }
     }();
   }
 
+  /// Whether a source is set, in [_src] or [_srcBytes].
+  bool get _hasSource => _src != null || _srcBytes != null;
+
   /// Pushes the currently tracked source ([_src] or [_srcBytes]) to the native
   /// [player], preparing it for playback.
   ///
   /// Used both when the source changes (from [update]) and to re-prepare
   /// playback after the player has reached [PlayerState.completed] under
   /// [ReleaseMode.release], where the native source has already been freed.
-  Future<void> _applySource() async {
-    if (_src != null) {
-      final assetSrc = control.backend.getAssetSource(_src!);
-      if (assetSrc.isFile) {
-        await player.setSourceDeviceFile(assetSrc.path);
-      } else {
-        await player.setSourceUrl(assetSrc.path);
+  /// Preparations run in order because setting a byte source may first write
+  /// a temporary file. A superseded preparation must finish before the latest
+  /// source is installed, otherwise its delayed write could replace that source.
+  Future<void> _applySource() {
+    final src = _src;
+    final srcBytes = _srcBytes;
+    final sourceVersion = _sourceVersion;
+    final preparation = _sourcePreparation.then((_) async {
+      if (sourceVersion != _sourceVersion) return;
+      if (src != null) {
+        final assetSrc = control.backend.getAssetSource(src);
+        if (assetSrc.isFile) {
+          await player.setSourceDeviceFile(assetSrc.path);
+        } else {
+          await player.setSourceUrl(assetSrc.path);
+        }
+      } else if (srcBytes != null) {
+        await player.setSourceBytes(srcBytes);
       }
-    } else if (_srcBytes != null) {
-      await player.setSourceBytes(_srcBytes!);
-    }
+    });
+    // Keep the queue usable after a failed load. The caller still receives the
+    // original error and decides whether this preparation was superseded.
+    _sourcePreparation = preparation.then<void>((_) {},
+        onError: (Object error, StackTrace stackTrace) {});
+    return preparation;
   }
 
+  /// Handles a method call from Python.
+  ///
+  /// `play`, `resume` and `seek` throw while no source is set. The native
+  /// players don't reject them: a seek never reports completion, so the call
+  /// would only fail after timing out, and the web and Linux players remember
+  /// a `resume` and start playing as soon as a source is set.
   Future<dynamic> _invokeMethod(String name, dynamic args) async {
     debugPrint("Audio.$name($args)");
+    if (!_hasSource && const ["play", "resume", "seek"].contains(name)) {
+      throw Exception("Audio must have \"src\" specified to $name.");
+    }
     switch (name) {
       case "play":
         final position = parseDuration(args["position"]);
@@ -203,6 +271,7 @@ class AudioService extends FletService {
   @override
   void dispose() {
     debugPrint("Audio(${control.id}).dispose()");
+    _sourceVersion++;
     control.removeInvokeMethodListener(_invokeMethod);
     _onDurationChangedSubscription?.cancel();
     _onStateChangedSubscription?.cancel();

{flet_audio-1.0.4 → flet_audio-1.1.0.dev0}/src/flutter/flet_audio/pubspec.yaml

@@ -18,6 +18,8 @@ dependencies:
     path: ../../../../../../../packages/flet
 
 dev_dependencies:
+  audioplayers_platform_interface: ^7.2.0
+  path_provider_platform_interface: ^2.1.2
   flutter_test:
     sdk: flutter
   flutter_lints: ^3.0.0

flet_audio-1.0.4/src/flet_audio.egg-info/requires.txt

@@ -1 +0,0 @@
-flet==1.0.4