From c9bfb650929af158667c35e11df5dd1e40596d13 Mon Sep 17 00:00:00 2001 From: Frieder Hannenheim Date: Tue, 4 Jul 2023 19:09:17 +0200 Subject: [PATCH] remove on_audio_query --- src/lib/injection_container.dart | 4 --- .../datasources/local_music_fetcher_impl.dart | 4 +-- src/lib/system/models/song_model.dart | 2 -- src/pubspec.lock | 28 ++----------------- src/pubspec.yaml | 1 - 5 files changed, 3 insertions(+), 36 deletions(-) diff --git a/src/lib/injection_container.dart b/src/lib/injection_container.dart index 87cfb83..20c81dd 100644 --- a/src/lib/injection_container.dart +++ b/src/lib/injection_container.dart @@ -1,7 +1,6 @@ import 'package:audio_service/audio_service.dart'; import 'package:get_it/get_it.dart'; import 'package:just_audio/just_audio.dart'; -import 'package:on_audio_query/on_audio_query.dart'; import 'domain/actors/audio_player_actor.dart'; import 'domain/actors/music_data_actor.dart'; @@ -360,7 +359,6 @@ Future setupGetIt() async { () => LocalMusicFetcherImpl( getIt(), getIt(), - getIt(), ), ); @@ -387,8 +385,6 @@ Future setupGetIt() async { getIt.registerFactory(() => AudioPlayer()); - getIt.registerLazySingleton(() => OnAudioQuery()); - // actors getIt.registerSingleton( PlatformIntegrationActor( diff --git a/src/lib/system/datasources/local_music_fetcher_impl.dart b/src/lib/system/datasources/local_music_fetcher_impl.dart index 3ef2a9d..faf09ed 100644 --- a/src/lib/system/datasources/local_music_fetcher_impl.dart +++ b/src/lib/system/datasources/local_music_fetcher_impl.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_fimber/flutter_fimber.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge.dart'; import 'package:metadata_god/metadata_god.dart'; -import 'package:on_audio_query/on_audio_query.dart' as aq; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; import 'package:permission_handler/permission_handler.dart'; @@ -20,11 +19,10 @@ import 'music_data_source_contract.dart'; import 'settings_data_source.dart'; class LocalMusicFetcherImpl implements LocalMusicFetcher { - LocalMusicFetcherImpl(this._settingsDataSource, this._musicDataSource, this._onAudioQuery); + LocalMusicFetcherImpl(this._settingsDataSource, this._musicDataSource); static final _log = FimberLog('LocalMusicFetcher'); - final aq.OnAudioQuery _onAudioQuery; final SettingsDataSource _settingsDataSource; final MusicDataSource _musicDataSource; diff --git a/src/lib/system/models/song_model.dart b/src/lib/system/models/song_model.dart index 161830f..cba01c2 100644 --- a/src/lib/system/models/song_model.dart +++ b/src/lib/system/models/song_model.dart @@ -3,12 +3,10 @@ import 'dart:ui'; import 'package:audio_service/audio_service.dart'; import 'package:drift/drift.dart'; import 'package:metadata_god/metadata_god.dart'; -import 'package:on_audio_query/on_audio_query.dart' as aq; import 'package:path/path.dart' as p; import '../../domain/entities/song.dart'; import '../datasources/drift_database.dart'; -import '../utils.dart'; import 'default_values.dart'; class SongModel extends Song { diff --git a/src/pubspec.lock b/src/pubspec.lock index 8d9f06b..47028e8 100644 --- a/src/pubspec.lock +++ b/src/pubspec.lock @@ -477,14 +477,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - id3: - dependency: transitive - description: - name: id3 - sha256: "24176a6e08db6297c8450079e94569cd8387f913c817e5e3d862be7dc191e0b8" - url: "https://pub.dev" - source: hosted - version: "1.0.2" intl: dependency: "direct main" description: @@ -622,14 +614,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - on_audio_query: - dependency: "direct main" - description: - name: on_audio_query - sha256: "151c7d636f48e7cbb5080748114c7a10aea8fdb8c3e1d7f48819146b346e0e38" - url: "https://pub.dev" - source: hosted - version: "2.6.1" on_audio_query_platform_interface: dependency: "direct main" description: @@ -638,14 +622,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" - on_audio_query_web: - dependency: transitive - description: - name: on_audio_query_web - sha256: "4e7028187354530b1d88441fd1e18ecd63539dd5306cea5adc3dc6bf92382aed" - url: "https://pub.dev" - source: hosted - version: "1.3.2+2" optimization_battery: dependency: "direct main" description: @@ -1183,10 +1159,10 @@ packages: dependency: transitive description: name: win32_registry - sha256: "1c52f994bdccb77103a6231ad4ea331a244dbcef5d1f37d8462f713143b0bfae" + sha256: e4506d60b7244251bc59df15656a3093501c37fb5af02105a944d73eb95be4c9 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" xdg_directories: dependency: transitive description: diff --git a/src/pubspec.yaml b/src/pubspec.yaml index 12099b8..caeba09 100644 --- a/src/pubspec.yaml +++ b/src/pubspec.yaml @@ -34,7 +34,6 @@ dependencies: rev: HEAD path: packages/metadata_god mobx: 2.1.3 # MIT - on_audio_query: 2.6.1 # BSD 3 on_audio_query_platform_interface: 1.4.0 optimization_battery: ^0.0.7 # MIT package_info_plus: ^4.0.1