From a2beb13edd90655e2336cdb050fb03b9d6603881 Mon Sep 17 00:00:00 2001 From: klockky Date: Thu, 25 Jun 2026 18:38:17 +0300 Subject: [PATCH] =?UTF-8?q?fix(desktop):=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20fvp=20=D0=BD=D0=B0=20media=5Fkit=20?= =?UTF-8?q?=E2=80=94=20=D0=B4=D0=B5=D1=81=D0=BA=D1=82=D0=BE=D0=BF-=D1=81?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D0=BF=D0=B0=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20mdk-sdk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 --- lib/main.dart | 10 +++-- pubspec.lock | 120 ++++++++++++++++++++++++++++++++++++++++++++++---- pubspec.yaml | 3 +- 3 files changed, 120 insertions(+), 13 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 61fa9cc..b6291ac 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,8 +4,8 @@ import 'dart:ui' as ui; import 'package:dynamic_color/dynamic_color.dart'; import 'package:flutter/material.dart'; -import 'package:fvp/fvp.dart' as fvp; import 'package:flutter/rendering.dart'; +import 'package:video_player_media_kit/video_player_media_kit.dart'; import 'package:komet/l10n/app_localizations.dart'; import 'package:m3e_collection/m3e_collection.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -87,9 +87,11 @@ Future _loadInitialLocale() async { void main() async { WidgetsFlutterBinding.ensureInitialized(); - fvp.registerWith(options: { - 'platforms': ['windows', 'linux', 'macos'], - }); + VideoPlayerMediaKit.ensureInitialized( + windows: true, + linux: true, + macOS: true, + ); if (AppInstance.isNamed) { SharedPreferences.setPrefix('flutter.${AppInstance.id}.'); } diff --git a/pubspec.lock b/pubspec.lock index 2d2b75d..69e9882 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -613,14 +613,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.2" - fvp: - dependency: "direct main" - description: - name: fvp - sha256: "0f147516a2520bb37efc9027bce1f20a0aa4487428e9f1437ad7dfa449aa93bd" - url: "https://pub.dev" - source: hosted - version: "0.37.2" geolocator: dependency: "direct main" description: @@ -893,6 +885,70 @@ packages: url: "https://pub.dev" source: hosted version: "4.2951.0" + media_kit: + dependency: transitive + description: + name: media_kit + sha256: ae9e79597500c7ad6083a3c7b7b7544ddabfceacce7ae5c9709b0ec16a5d6643 + url: "https://pub.dev" + source: hosted + version: "1.2.6" + media_kit_libs_android_video: + dependency: transitive + description: + name: media_kit_libs_android_video + sha256: "3f6274e5ab2de512c286a25c327288601ee445ed8ac319e0ef0b66148bd8f76c" + url: "https://pub.dev" + source: hosted + version: "1.3.8" + media_kit_libs_ios_video: + dependency: transitive + description: + name: media_kit_libs_ios_video + sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991 + url: "https://pub.dev" + source: hosted + version: "1.1.4" + media_kit_libs_linux: + dependency: transitive + description: + name: media_kit_libs_linux + sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf" + url: "https://pub.dev" + source: hosted + version: "1.2.1" + media_kit_libs_macos_video: + dependency: transitive + description: + name: media_kit_libs_macos_video + sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d + url: "https://pub.dev" + source: hosted + version: "1.1.4" + media_kit_libs_video: + dependency: "direct main" + description: + name: media_kit_libs_video + sha256: "2b235b5dac79c6020e01eef5022c6cc85fedc0df1738aadc6ea489daa12a92a9" + url: "https://pub.dev" + source: hosted + version: "1.0.7" + media_kit_libs_windows_video: + dependency: transitive + description: + name: media_kit_libs_windows_video + sha256: dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab + url: "https://pub.dev" + source: hosted + version: "1.0.11" + media_kit_video: + dependency: transitive + description: + name: media_kit_video + sha256: afaa509e7b7e0bf247557a3a740cde903a52c34ace9810f94500e127bd7b043d + url: "https://pub.dev" + source: hosted + version: "2.0.1" meta: dependency: transitive description: @@ -1213,6 +1269,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.28.0" + safe_local_storage: + dependency: transitive + description: + name: safe_local_storage + sha256: "7483b3d5e8976f0bd263647c03b96131ee8e43f48b56fa8a8ec459e8515d74b0" + url: "https://pub.dev" + source: hosted + version: "2.0.4" shared_preferences: dependency: "direct main" description: @@ -1442,6 +1506,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + universal_platform: + dependency: transitive + description: + name: universal_platform + sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + uri_parser: + dependency: transitive + description: + name: uri_parser + sha256: "051c62e5f693de98ca9f130ee707f8916e2266945565926be3ff20659f7853ce" + url: "https://pub.dev" + source: hosted + version: "3.0.2" url_launcher: dependency: "direct main" description: @@ -1546,6 +1626,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.9.7" + video_player_media_kit: + dependency: "direct main" + description: + name: video_player_media_kit + sha256: "66c5f30e2700f4528154320e708f89f4a80075b2451bebc6fef73a15d63a3fca" + url: "https://pub.dev" + source: hosted + version: "2.0.0" video_player_platform_interface: dependency: transitive description: @@ -1570,6 +1658,22 @@ packages: url: "https://pub.dev" source: hosted version: "15.2.0" + wakelock_plus: + dependency: transitive + description: + name: wakelock_plus + sha256: ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1 + url: "https://pub.dev" + source: hosted + version: "1.5.2" + wakelock_plus_platform_interface: + dependency: transitive + description: + name: wakelock_plus_platform_interface + sha256: b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b + url: "https://pub.dev" + source: hosted + version: "1.5.1" web: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b6c1647..5870329 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -74,8 +74,9 @@ dependencies: opus_dart: ^3.0.1 opus_flutter_android: ^3.0.1 ogg_opus_player: ^0.8.0 - fvp: ^0.37.2 camera: ^0.11.0 + video_player_media_kit: ^2.0.0 + media_kit_libs_video: ^1.0.7 dev_dependencies: flutter_test: