From 7949f92b9097dee911dc5fa912afd89660e1386c Mon Sep 17 00:00:00 2001 From: creativecreatorormaybenot Date: Tue, 20 Oct 2020 10:09:07 +0000 Subject: [PATCH] Remove debug print statements (#216) * Remove prints * Add proper gitignore * Remove .idea * Delete .gitignore * Create .gitignore --- just_audio/CHANGELOG.md | 4 ++ just_audio/lib/just_audio.dart | 41 +++++++---------- just_audio/pubspec.yaml | 2 +- just_audio_web/CHANGELOG.md | 4 ++ just_audio_web/lib/just_audio_web.dart | 64 +++++++++++--------------- just_audio_web/pubspec.yaml | 2 +- 6 files changed, 54 insertions(+), 63 deletions(-) diff --git a/just_audio/CHANGELOG.md b/just_audio/CHANGELOG.md index f6fc49c..9cd7712 100644 --- a/just_audio/CHANGELOG.md +++ b/just_audio/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.4+2 + +* Removed `print` statements from plugin code. + ## 0.5.4+1 * Add web dependency. diff --git a/just_audio/lib/just_audio.dart b/just_audio/lib/just_audio.dart index c868cc8..d851319 100644 --- a/just_audio/lib/just_audio.dart +++ b/just_audio/lib/just_audio.dart @@ -127,30 +127,24 @@ class AudioPlayer { .handleError((err, stack) {/* noop */})); _platform.then((platform) { platform.playbackEventMessageStream.listen((message) { - try { - final playbackEvent = PlaybackEvent( - processingState: - ProcessingState.values[message.processingState.index], - updateTime: message.updateTime, - updatePosition: message.updatePosition, - bufferedPosition: message.bufferedPosition, - duration: message.duration, - icyMetadata: message.icyMetadata == null - ? null - : IcyMetadata._fromMessage(message.icyMetadata), - currentIndex: message.currentIndex, - androidAudioSessionId: message.androidAudioSessionId, - ); - _durationFuture = Future.value(playbackEvent.duration); - if (playbackEvent.duration != _playbackEvent.duration) { - _durationSubject.add(playbackEvent.duration); - } - _playbackEventSubject.add(_playbackEvent = playbackEvent); - } catch (e, stacktrace) { - print("Error parsing event: $e"); - print("$stacktrace"); - rethrow; + final playbackEvent = PlaybackEvent( + processingState: + ProcessingState.values[message.processingState.index], + updateTime: message.updateTime, + updatePosition: message.updatePosition, + bufferedPosition: message.bufferedPosition, + duration: message.duration, + icyMetadata: message.icyMetadata == null + ? null + : IcyMetadata._fromMessage(message.icyMetadata), + currentIndex: message.currentIndex, + androidAudioSessionId: message.androidAudioSessionId, + ); + _durationFuture = Future.value(playbackEvent.duration); + if (playbackEvent.duration != _playbackEvent.duration) { + _durationSubject.add(playbackEvent.duration); } + _playbackEventSubject.add(_playbackEvent = playbackEvent); }, onError: _playbackEventSubject.addError); }); _sequenceSubject.add(null); @@ -700,7 +694,6 @@ class AudioPlayer { await JustAudioPlatform.instance .disposePlayer(DisposePlayerRequest(id: _id)); } catch (e) { - print("disposePlayer() not implemented. Falling back to dispose()"); await (await _platform).dispose(DisposeRequest()); } _audioSource = null; diff --git a/just_audio/pubspec.yaml b/just_audio/pubspec.yaml index bc3a30d..83cd7b8 100644 --- a/just_audio/pubspec.yaml +++ b/just_audio/pubspec.yaml @@ -1,6 +1,6 @@ name: just_audio description: Flutter plugin to play audio from streams, files, assets, DASH/HLS streams and playlists. Works with audio_service to play audio in the background. -version: 0.5.4+1 +version: 0.5.4+2 homepage: https://github.com/ryanheise/just_audio/tree/master/just_audio environment: diff --git a/just_audio_web/CHANGELOG.md b/just_audio_web/CHANGELOG.md index a1df867..05ff112 100644 --- a/just_audio_web/CHANGELOG.md +++ b/just_audio_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.0+1 + +* Removed `print` statements from plugin code. + ## 0.1.0 * Update to use platform interface 1.1.0. diff --git a/just_audio_web/lib/just_audio_web.dart b/just_audio_web/lib/just_audio_web.dart index 40d3f32..a792316 100644 --- a/just_audio_web/lib/just_audio_web.dart +++ b/just_audio_web/lib/just_audio_web.dart @@ -13,7 +13,6 @@ class JustAudioPlugin extends JustAudioPlatform { final Map players = {}; static void registerWith(Registrar registrar) { - print("registerWith setting instance"); JustAudioPlatform.instance = JustAudioPlugin(); } @@ -179,7 +178,6 @@ class Html5AudioPlayer extends JustAudioPlayer { @override Future load(LoadRequest request) async { - print("web load"); _currentAudioSourcePlayer?.pause(); _audioSourcePlayer = getAudioSource(request.audioSourceMessage); _index = request.initialIndex ?? 0; @@ -198,7 +196,6 @@ class Html5AudioPlayer extends JustAudioPlayer { } Future loadUri(final Uri uri) async { - print("loadUri $uri"); transition(ProcessingStateMessage.loading); final src = uri.toString(); if (src != _audioElement.src) { @@ -217,7 +214,6 @@ class Html5AudioPlayer extends JustAudioPlayer { } transition(ProcessingStateMessage.ready); final seconds = _audioElement.duration; - print("loadUri returning"); return seconds.isFinite ? Duration(milliseconds: (seconds * 1000).toInt()) : null; @@ -370,7 +366,6 @@ class Html5AudioPlayer extends JustAudioPlayer { @override Future release() async { - print("web release"); _currentAudioSourcePlayer?.pause(); _audioElement.removeAttribute('src'); _audioElement.load(); @@ -392,38 +387,33 @@ class Html5AudioPlayer extends JustAudioPlayer { } AudioSourcePlayer decodeAudioSource(AudioSourceMessage audioSourceMessage) { - try { - if (audioSourceMessage is ProgressiveAudioSourceMessage) { - return ProgressiveAudioSourcePlayer(this, audioSourceMessage.id, - Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); - } else if (audioSourceMessage is DashAudioSourceMessage) { - return DashAudioSourcePlayer(this, audioSourceMessage.id, - Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); - } else if (audioSourceMessage is HlsAudioSourceMessage) { - return HlsAudioSourcePlayer(this, audioSourceMessage.id, - Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); - } else if (audioSourceMessage is ConcatenatingAudioSourceMessage) { - return ConcatenatingAudioSourcePlayer( - this, - audioSourceMessage.id, - getAudioSources(audioSourceMessage.children), - audioSourceMessage.useLazyPreparation); - } else if (audioSourceMessage is ClippingAudioSourceMessage) { - return ClippingAudioSourcePlayer( - this, - audioSourceMessage.id, - getAudioSource(audioSourceMessage.child), - audioSourceMessage.start, - audioSourceMessage.end); - } else if (audioSourceMessage is LoopingAudioSourceMessage) { - return LoopingAudioSourcePlayer(this, audioSourceMessage.id, - getAudioSource(audioSourceMessage.child), audioSourceMessage.count); - } else { - throw Exception("Unknown AudioSource type: $audioSourceMessage"); - } - } catch (e, stacktrace) { - print("$stacktrace"); - rethrow; + if (audioSourceMessage is ProgressiveAudioSourceMessage) { + return ProgressiveAudioSourcePlayer(this, audioSourceMessage.id, + Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); + } else if (audioSourceMessage is DashAudioSourceMessage) { + return DashAudioSourcePlayer(this, audioSourceMessage.id, + Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); + } else if (audioSourceMessage is HlsAudioSourceMessage) { + return HlsAudioSourcePlayer(this, audioSourceMessage.id, + Uri.parse(audioSourceMessage.uri), audioSourceMessage.headers); + } else if (audioSourceMessage is ConcatenatingAudioSourceMessage) { + return ConcatenatingAudioSourcePlayer( + this, + audioSourceMessage.id, + getAudioSources(audioSourceMessage.children), + audioSourceMessage.useLazyPreparation); + } else if (audioSourceMessage is ClippingAudioSourceMessage) { + return ClippingAudioSourcePlayer( + this, + audioSourceMessage.id, + getAudioSource(audioSourceMessage.child), + audioSourceMessage.start, + audioSourceMessage.end); + } else if (audioSourceMessage is LoopingAudioSourceMessage) { + return LoopingAudioSourcePlayer(this, audioSourceMessage.id, + getAudioSource(audioSourceMessage.child), audioSourceMessage.count); + } else { + throw Exception("Unknown AudioSource type: $audioSourceMessage"); } } } diff --git a/just_audio_web/pubspec.yaml b/just_audio_web/pubspec.yaml index c5a9943..6eff4c2 100644 --- a/just_audio_web/pubspec.yaml +++ b/just_audio_web/pubspec.yaml @@ -1,7 +1,7 @@ name: just_audio_web description: Web platform implementation of just_audio homepage: https://github.com/ryanheise/just_audio/tree/master/just_audio_web -version: 0.1.0 +version: 0.1.0+1 flutter: plugin: