From 24d97848eecadf200d80792ea5d855b8a977f43c Mon Sep 17 00:00:00 2001 From: Ryan Heise Date: Tue, 21 Apr 2020 23:14:39 +1000 Subject: [PATCH] Set Icy Metadata to null on iOS --- darwin/Classes/AudioPlayer.m | 2 + example/pubspec.lock | 72 ++++++++++++++++++++++++++++-------- lib/just_audio.dart | 2 +- 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/darwin/Classes/AudioPlayer.m b/darwin/Classes/AudioPlayer.m index 2cf5434..b839be8 100644 --- a/darwin/Classes/AudioPlayer.m +++ b/darwin/Classes/AudioPlayer.m @@ -130,6 +130,8 @@ @(_updateTime), // TODO: buffer position @(_updatePosition), + // TODO: Icy Metadata + [NSNull null], ]); } diff --git a/example/pubspec.lock b/example/pubspec.lock index 4867e8d..107d05a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,6 +1,20 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.13" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.0" async: dependency: transitive description: @@ -22,13 +36,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.3" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" collection: dependency: transitive description: @@ -36,6 +43,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.14.12" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" cupertino_icons: dependency: "direct main" description: @@ -43,13 +64,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -65,6 +79,13 @@ packages: description: flutter source: sdk version: "0.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.12" just_audio: dependency: "direct dev" description: @@ -92,7 +113,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.6.4" path_provider: dependency: transitive description: @@ -100,6 +121,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.5.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" platform: dependency: transitive description: @@ -107,6 +135,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.1" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" rxdart: dependency: "direct main" description: @@ -175,6 +210,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.1" sdks: dart: ">=2.6.0 <3.0.0" flutter: ">=1.12.8 <2.0.0" diff --git a/lib/just_audio.dart b/lib/just_audio.dart index cce161b..5bd283b 100644 --- a/lib/just_audio.dart +++ b/lib/just_audio.dart @@ -119,7 +119,7 @@ class AudioPlayer { bufferedPosition: Duration(milliseconds: data[4]), speed: _speed, duration: _duration, - icyMetadata: IcyMetadata( + icyMetadata: data[5] == null ? null : IcyMetadata( info: IcyInfo(title: data[5][0][0], url: data[5][0][1]), headers: IcyHeaders( bitrate: data[5][1][0],