exttex/just_audio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Icy metadata support on Android (#78)

Browse source 
* Add Icy "info" metadata to Android playback events

* Add IcyMetadata stream to the Flutter module

* Update ExoPlayer to 2.11.4

* Use Player.EventListener.onTracksChanged to retrieve IcyHeaders

* Iterate over each track of trackGroups to look for IcyHeaders
This commit is contained in:
Andrea Jonus 2020-04-21 22:57:32 +10:00 • committed by GitHub
parent ea4be9f9ad
commit 0f57b69ead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 143 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

75
lib/just_audio.dart
View file

@ -69,6 +69,15 @@ class AudioPlayer {
bufferedPosition: Duration.zero,
speed: 1.0,
duration: Duration.zero,
icyMetadata: IcyMetadata(
info: IcyInfo(title: null, url: null),
headers: IcyHeaders(
bitrate: null,
genre: null,
name: null,
metadataInterval: null,
url: null,
isPublic: null)),
);
Stream<AudioPlaybackEvent> _eventChannelStream;
@ -83,6 +92,8 @@ class AudioPlayer {
final _bufferedPositionSubject = BehaviorSubject<Duration>();
final _icyMetadataSubject = BehaviorSubject<IcyMetadata>();
final _fullPlaybackStateSubject = BehaviorSubject<FullAudioPlaybackState>();
double _volume = 1.0;
@ -108,6 +119,15 @@ class AudioPlayer {
bufferedPosition: Duration(milliseconds: data[4]),
speed: _speed,
duration: _duration,
icyMetadata: IcyMetadata(
info: IcyInfo(title: data[5][0][0], url: data[5][0][1]),
headers: IcyHeaders(
bitrate: data[5][1][0],
genre: data[5][1][1],
name: data[5][1][2],
metadataInterval: data[5][1][3],
url: data[5][1][4],
isPublic: data[5][1][5])),
));
_eventChannelStreamSubscription =
_eventChannelStream.listen(_playbackEventSubject.add);
@ -117,11 +137,15 @@ class AudioPlayer {
playbackEventStream.map((state) => state.buffering).distinct());
_bufferedPositionSubject.addStream(
playbackEventStream.map((state) => state.bufferedPosition).distinct());
_fullPlaybackStateSubject.addStream(
Rx.combineLatest2<AudioPlaybackState, bool, FullAudioPlaybackState>(
playbackStateStream,
bufferingStream,
(state, buffering) => FullAudioPlaybackState(state, buffering)));
_icyMetadataSubject.addStream(
playbackEventStream.map((state) => state.icyMetadata).distinct());
_fullPlaybackStateSubject.addStream(Rx.combineLatest3<AudioPlaybackState,
bool, IcyMetadata, FullAudioPlaybackState>(
playbackStateStream,
bufferingStream,
icyMetadataStream,
(state, buffering, icyMetadata) =>
FullAudioPlaybackState(state, buffering, icyMetadata)));
}
/// The duration of any media set via [setUrl], [setFilePath] or [setAsset],
@ -148,9 +172,13 @@ class AudioPlayer {
/// Whether the player is buffering.
bool get buffering => _audioPlaybackEvent.buffering;
IcyMetadata get icyMetadata => _audioPlaybackEvent.icyMetadata;
/// A stream of buffering state changes.
Stream<bool> get bufferingStream => _bufferingSubject.stream;
Stream<IcyMetadata> get icyMetadataStream => _icyMetadataSubject.stream;
/// A stream of buffered positions.
Stream<Duration> get bufferedPositionStream =>
_bufferedPositionSubject.stream;
@ -394,6 +422,8 @@ class AudioPlaybackEvent {
/// The media duration.
final Duration duration;
final IcyMetadata icyMetadata;
AudioPlaybackEvent({
@required this.state,
@required this.buffering,
@ -402,6 +432,7 @@ class AudioPlaybackEvent {
@required this.bufferedPosition,
@required this.speed,
@required this.duration,
@required this.icyMetadata,
});
AudioPlaybackEvent copyWith({
@ -462,6 +493,38 @@ enum AudioPlaybackState {
class FullAudioPlaybackState {
final AudioPlaybackState state;
final bool buffering;
final IcyMetadata icyMetadata;
FullAudioPlaybackState(this.state, this.buffering);
FullAudioPlaybackState(this.state, this.buffering, this.icyMetadata);
}
class IcyInfo {
final String title;
final String url;
IcyInfo({@required this.title, @required this.url});
}
class IcyHeaders {
final int bitrate;
final String genre;
final String name;
final int metadataInterval;
final String url;
final bool isPublic;
IcyHeaders(
{@required this.bitrate,
@required this.genre,
@required this.name,
@required this.metadataInterval,
@required this.url,
@required this.isPublic});
}
class IcyMetadata {
final IcyInfo info;
final IcyHeaders headers;
IcyMetadata({@required this.info, @required this.headers});
}