be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up MediaSessionManager

This commit is contained in:
Stypox 2020-09-03 22:04:58 +02:00
parent 97ff9e9c5b
commit 628575dc5f
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
View File

@ -112,7 +112,7 @@ public final class NotificationUtil {
compactSlot2 = 2; compactSlot2 = 2;
} }
} }
} catch (Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -184,8 +184,8 @@ public final class NotificationUtil {
notificationManager.cancel(NOTIFICATION_ID); notificationManager.cancel(NOTIFICATION_ID);
notificationManager = null; notificationManager = null;
} }
} catch (Exception e) { } catch (final Exception e) {
Log.e("NotificationUtil", "Exception", e); Log.e(TAG, "Could not cancel notification", e);
} }
} }

27
app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
View File

@ -29,10 +29,8 @@ public class MediaSessionManager {
private final MediaSessionCompat mediaSession; private final MediaSessionCompat mediaSession;
@NonNull @NonNull
private final MediaSessionConnector sessionConnector; private final MediaSessionConnector sessionConnector;
@NonNull
private final PlaybackStateCompat.Builder playbackStateCompatBuilder;
private int tmpThumbHash; private int lastAlbumArtHashCode;
public MediaSessionManager(@NonNull final Context context, public MediaSessionManager(@NonNull final Context context,
@NonNull final Player player, @NonNull final Player player,
@ -42,15 +40,16 @@ public class MediaSessionManager {
| MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS); | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
this.mediaSession.setActive(true); this.mediaSession.setActive(true);
this.playbackStateCompatBuilder = new PlaybackStateCompat.Builder(); this.mediaSession.setPlaybackState(new PlaybackStateCompat.Builder()
this.playbackStateCompatBuilder.setState(PlaybackStateCompat.STATE_NONE, -1, 1); .setState(PlaybackStateCompat.STATE_NONE, -1, 1)
this.playbackStateCompatBuilder.setActions(PlaybackStateCompat.ACTION_SEEK_TO .setActions(PlaybackStateCompat.ACTION_SEEK_TO
| PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PLAY
| PlaybackStateCompat.ACTION_PAUSE // was play and pause now play/pause | PlaybackStateCompat.ACTION_PAUSE // was play and pause now play/pause
| PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_NEXT
| PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
| PlaybackStateCompat.ACTION_SET_REPEAT_MODE | PlaybackStateCompat.ACTION_STOP); | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
this.mediaSession.setPlaybackState(playbackStateCompatBuilder.build()); | PlaybackStateCompat.ACTION_STOP)
.build());
this.sessionConnector = new MediaSessionConnector(mediaSession); this.sessionConnector = new MediaSessionConnector(mediaSession);
this.sessionConnector.setControlDispatcher(new PlayQueuePlaybackController(callback)); this.sessionConnector.setControlDispatcher(new PlayQueuePlaybackController(callback));
@ -91,7 +90,7 @@ public class MediaSessionManager {
if (getMetadataAlbumArt() == null || getMetadataTitle() == null if (getMetadataAlbumArt() == null || getMetadataTitle() == null
|| getMetadataArtist() == null || getMetadataDuration() <= 1 || getMetadataArtist() == null || getMetadataDuration() <= 1
|| albumArt.hashCode() != tmpThumbHash) { || albumArt.hashCode() != lastAlbumArtHashCode) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "setMetadata: N_Metadata update: t: " + title + " a: " + artist Log.d(TAG, "setMetadata: N_Metadata update: t: " + title + " a: " + artist
+ " thumb: " + albumArt.hashCode() + " d: " + duration); + " thumb: " + albumArt.hashCode() + " d: " + duration);
@ -103,7 +102,7 @@ public class MediaSessionManager {
.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, albumArt) .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, albumArt)
.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, albumArt) .putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, albumArt)
.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, duration).build()); .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, duration).build());
tmpThumbHash = albumArt.hashCode(); lastAlbumArtHashCode = albumArt.hashCode();
} }
} }