flet-audio 0.1.0.dev3__py3-none-any.whl → 0.2.0.dev35__py3-none-any.whl

flutter/flet_audio/lib/src/audio.dart

@@ -2,59 +2,48 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:audioplayers/audioplayers.dart';
-import 'package:collection/collection.dart';
 import 'package:flet/flet.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
 
-class AudioControl extends StatefulWidget {
-  final Control? parent;
-  final Control control;
-  final Widget? nextChild;
-  final FletControlBackend backend;
+import 'utils/audio.dart';
 
-  const AudioControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.nextChild,
-      required this.backend});
+class AudioService extends FletService {
+  AudioService({required super.control});
 
-  @override
-  State<AudioControl> createState() => _AudioControlState();
-}
-
-class _AudioControlState extends State<AudioControl> with FletStoreMixin {
-  AudioPlayer? player;
-  void Function(Duration)? _onDurationChanged;
-  void Function(PlayerState)? _onStateChanged;
-  void Function(int)? _onPositionChanged;
+  AudioPlayer player = AudioPlayer();
   Duration? _duration;
   int _position = -1;
-  void Function()? _onSeekComplete;
   StreamSubscription? _onDurationChangedSubscription;
   StreamSubscription? _onStateChangedSubscription;
   StreamSubscription? _onPositionChangedSubscription;
   StreamSubscription? _onSeekCompleteSubscription;
 
+  String? _src;
+  String? _srcBase64;
+  ReleaseMode? _releaseMode;
+  double? _volume;
+  double? _balance;
+  double? _playbackRate;
+
   @override
-  void initState() {
-    debugPrint("Audio.initState($hashCode)");
-    player = widget.control.state["player"];
-    if (player == null) {
-      player = AudioPlayer();
-      player = widget.control.state["player"] = player;
-    }
+  void init() {
+    super.init();
+    debugPrint("Audio(${control.id}).init: ${control.properties}");
+    control.addInvokeMethodListener(_invokeMethod);
+
     _onDurationChangedSubscription =
-        player?.onDurationChanged.listen((duration) {
-      _onDurationChanged?.call(duration);
+        player.onDurationChanged.listen((duration) {
+      control.triggerEvent(
+          "duration_change", {"duration": duration.inMilliseconds});
       _duration = duration;
     });
-    _onStateChangedSubscription = player?.onPlayerStateChanged.listen((state) {
-      _onStateChanged?.call(state);
+
+    _onStateChangedSubscription = player.onPlayerStateChanged.listen((PlayerState state) {
+      control.triggerEvent("state_change", {"state": state.name});
     });
+
     _onPositionChangedSubscription =
-        player?.onPositionChanged.listen((position) {
+        player.onPositionChanged.listen((position) {
       int posMs = (position.inMilliseconds / 1000).round() * 1000;
       if (posMs != _position) {
         _position = posMs;
@@ -63,184 +52,126 @@ class _AudioControlState extends State<AudioControl> with FletStoreMixin {
       } else {
         return;
       }
-      _onPositionChanged?.call(_position);
-    });
-    _onSeekCompleteSubscription = player?.onSeekComplete.listen((event) {
-      _onSeekComplete?.call();
+      control.triggerEvent("position_change", {"position": posMs});
     });
 
-    widget.control.onRemove.clear();
-    widget.control.onRemove.add(_onRemove);
-    super.initState();
-  }
-
-  void _onRemove() {
-    debugPrint("Audio.remove($hashCode)");
-    widget.control.state["player"]?.dispose();
-    widget.backend.unsubscribeMethods(widget.control.id);
-  }
+    _onSeekCompleteSubscription = player.onSeekComplete.listen((event) {
+      control.triggerEvent("seek_complete");
+    });
 
-  @override
-  void deactivate() {
-    debugPrint("Audio.deactivate($hashCode)");
-    _onDurationChangedSubscription?.cancel();
-    _onStateChangedSubscription?.cancel();
-    _onPositionChangedSubscription?.cancel();
-    _onSeekCompleteSubscription?.cancel();
-    super.deactivate();
+    update();
   }
 
   @override
-  Widget build(BuildContext context) {
-    debugPrint(
-        "Audio build: ${widget.control.id} (${widget.control.hashCode})");
+  void update() {
+    debugPrint("Audio(${control.id}).update: ${control.properties}");
 
-    var src = widget.control.attrString("src", "")!;
-    var srcBase64 = widget.control.attrString("srcBase64", "")!;
+    var src = control.getString("src", "")!;
+    var srcBase64 = control.getString("src_base64", "")!;
     if (src == "" && srcBase64 == "") {
-      return const ErrorControl(
+      throw Exception(
           "Audio must have either \"src\" or \"src_base64\" specified.");
     }
-    bool autoplay = widget.control.attrBool("autoplay", false)!;
-    double? volume = widget.control.attrDouble("volume", null);
-    double? balance = widget.control.attrDouble("balance", null);
-    double? playbackRate = widget.control.attrDouble("playbackRate", null);
-    var releaseMode = ReleaseMode.values.firstWhereOrNull((e) =>
-        e.name.toLowerCase() ==
-        widget.control.attrString("releaseMode", "")!.toLowerCase());
-    bool onPositionChanged =
-        widget.control.attrBool("onPositionChanged", false)!;
-
-    final String prevSrc = widget.control.state["src"] ?? "";
-    final String prevSrcBase64 = widget.control.state["srcBase64"] ?? "";
-    final ReleaseMode? prevReleaseMode = widget.control.state["releaseMode"];
-    final double? prevVolume = widget.control.state["volume"];
-    final double? prevBalance = widget.control.state["balance"];
-    final double? prevPlaybackRate = widget.control.state["playbackRate"];
-
-    return withPageArgs((context, pageArgs) {
-      _onDurationChanged = (duration) {
-        widget.backend.triggerControlEvent(widget.control.id,
-            "duration_changed", duration.inMilliseconds.toString());
-      };
-
-      _onStateChanged = (state) {
-        debugPrint("Audio($hashCode) - state_changed: ${state.name}");
-        widget.backend.triggerControlEvent(
-            widget.control.id, "state_changed", state.name.toString());
-      };
-
-      if (onPositionChanged) {
-        _onPositionChanged = (position) {
-          widget.backend.triggerControlEvent(
-              widget.control.id, "position_changed", position.toString());
-        };
+    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;
+      if (src != "" && src != _src) {
+        _src = src;
+        srcChanged = true;
+
+        // URL or file?
+        var assetSrc = control.backend.getAssetSource(src);
+        if (assetSrc.isFile) {
+          await player.setSourceDeviceFile(assetSrc.path);
+        } else {
+          await player.setSourceUrl(assetSrc.path);
+        }
+      } else if (srcBase64 != "" && srcBase64 != _srcBase64) {
+        _srcBase64 = srcBase64;
+        srcChanged = true;
+        await player.setSourceBytes(base64Decode(srcBase64));
       }
 
-      _onSeekComplete = () {
-        widget.backend.triggerControlEvent(widget.control.id, "seek_complete");
-      };
-
-      () async {
-        debugPrint("Audio ($hashCode) src=$src, prevSrc=$prevSrc");
-        debugPrint(
-            "Audio ($hashCode) srcBase64=$srcBase64, prevSrcBase64=$prevSrcBase64");
-
-        bool srcChanged = false;
-        if (src != "" && src != prevSrc) {
-          widget.control.state["src"] = src;
-          srcChanged = true;
-
-          // URL or file?
-          var assetSrc =
-              getAssetSrc(src, pageArgs.pageUri!, pageArgs.assetsDir);
-          if (assetSrc.isFile) {
-            await player?.setSourceDeviceFile(assetSrc.path);
-          } else {
-            await player?.setSourceUrl(assetSrc.path);
-          }
-        } else if (srcBase64 != "" && srcBase64 != prevSrcBase64) {
-          widget.control.state["srcBase64"] = srcBase64;
-          srcChanged = true;
-          await player?.setSourceBytes(base64Decode(srcBase64));
-        }
+      if (srcChanged) {
+        control.triggerEvent("loaded");
+      }
 
-        if (srcChanged) {
-          debugPrint("Audio.srcChanged!");
-          widget.backend.triggerControlEvent(widget.control.id, "loaded");
-        }
+      if (releaseMode != null && releaseMode != _releaseMode) {
+        _releaseMode = releaseMode;
+        await player.setReleaseMode(releaseMode);
+      }
 
-        if (releaseMode != null && releaseMode != prevReleaseMode) {
-          debugPrint("Audio.setReleaseMode($releaseMode)");
-          widget.control.state["releaseMode"] = releaseMode;
-          await player?.setReleaseMode(releaseMode);
-        }
+      if (volume != _volume && volume >= 0 && volume <= 1) {
+        _volume = volume;
+        await player.setVolume(volume);
+      }
 
-        if (volume != null &&
-            volume != prevVolume &&
-            volume >= 0 &&
-            volume <= 1) {
-          widget.control.state["volume"] = volume;
-          debugPrint("Audio.setVolume($volume)");
-          await player?.setVolume(volume);
-        }
+      if (playbackRate != _playbackRate) {
+        _playbackRate = playbackRate;
+        await player.setPlaybackRate(playbackRate);
+      }
 
-        if (playbackRate != null &&
-            playbackRate != prevPlaybackRate &&
-            playbackRate >= 0 &&
-            playbackRate <= 2) {
-          widget.control.state["playbackRate"] = playbackRate;
-          debugPrint("Audio.setPlaybackRate($playbackRate)");
-          await player?.setPlaybackRate(playbackRate);
-        }
+      if (!kIsWeb &&
+          balance != _balance &&
+          balance >= -1 &&
+          balance <= 1) {
+        _balance = balance;
+        await player.setBalance(balance);
+      }
 
-        if (!kIsWeb &&
-            balance != null &&
-            balance != prevBalance &&
-            balance >= -1 &&
-            balance <= 1) {
-          widget.control.state["balance"] = balance;
-          debugPrint("Audio.setBalance($balance)");
-          await player?.setBalance(balance);
-        }
+      if (srcChanged && autoplay) {
+        await player.resume();
+      }
+    }();
+  }
 
-        if (srcChanged && autoplay) {
-          debugPrint("Audio.resume($srcChanged, $autoplay)");
-          await player?.resume();
+  Future<dynamic> _invokeMethod(String name, dynamic args) async {
+    debugPrint("Audio.$name($args)");
+    switch (name) {
+      case "play":
+        final position = parseDuration(args["position"]);
+        if (position != null) {
+          await player.seek(position);
+        }
+        await player.resume();
+        break;
+      case "resume":
+        await player.resume();
+        break;
+      case "pause":
+        await player.pause();
+        break;
+      case "release":
+        await player.release();
+        break;
+      case "seek":
+        final position = parseDuration(args["position"]);
+        if (position != null) {
+          await player.seek(position);
         }
+        break;
+      case "get_duration":
+        return await player.getDuration();
+      case "get_current_position":
+        return await player.getCurrentPosition();
+      default:
+        throw Exception("Unknown Audio method: $name");
+    }
+  }
 
-        widget.backend.subscribeMethods(widget.control.id,
-            (methodName, args) async {
-          switch (methodName) {
-            case "play":
-              await player?.seek(const Duration(milliseconds: 0));
-              await player?.resume();
-              break;
-            case "resume":
-              await player?.resume();
-              break;
-            case "pause":
-              await player?.pause();
-              break;
-            case "release":
-              await player?.release();
-              break;
-            case "seek":
-              await player?.seek(Duration(
-                  milliseconds: int.tryParse(args["position"] ?? "") ?? 0));
-              break;
-            case "get_duration":
-              return (await player?.getDuration())?.inMilliseconds.toString();
-            case "get_current_position":
-              return (await player?.getCurrentPosition())
-                  ?.inMilliseconds
-                  .toString();
-          }
-          return null;
-        });
-      }();
-
-      return const SizedBox.shrink();
-    });
+  @override
+  void dispose() {
+    debugPrint("Audio(${control.id}).dispose()");
+    control.removeInvokeMethodListener(_invokeMethod);
+    _onDurationChangedSubscription?.cancel();
+    _onStateChangedSubscription?.cancel();
+    _onPositionChangedSubscription?.cancel();
+    _onSeekCompleteSubscription?.cancel();
+    super.dispose();
   }
 }

flutter/flet_audio/lib/src/extension.dart

@@ -0,0 +1,15 @@
+import 'package:flet/flet.dart';
+
+import 'audio.dart';
+
+class Extension extends FletExtension {
+  @override
+  FletService? createService(Control control) {
+    switch (control.type) {
+      case "Audio":
+        return AudioService(control: control);
+      default:
+        return null;
+    }
+  }
+}

flutter/flet_audio/lib/src/utils/audio.dart

@@ -0,0 +1,9 @@
+import 'package:audioplayers/audioplayers.dart';
+import 'package:collection/collection.dart';
+
+ReleaseMode? parseReleaseMode(String? value, [ReleaseMode? defaultValue]) {
+  if (value == null) return defaultValue;
+  return ReleaseMode.values.firstWhereOrNull(
+          (e) => e.name.toLowerCase() == value.toLowerCase()) ??
+      defaultValue;
+}