From 1bd6f4cb0401c7afcafab1a3898b345f36646bc2 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 9 Mar 2021 01:31:58 +0900 Subject: [PATCH] move MultiPlayer class to playback directory --- .../com/dkanada/gramophone/service/MusicService.java | 3 ++- .../{MultiPlayer.java => playback/LocalPlayer.java} | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) rename app/src/main/java/com/dkanada/gramophone/service/{MultiPlayer.java => playback/LocalPlayer.java} (95%) diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java index c8677a5d..6fa7effa 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java +++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java @@ -45,6 +45,7 @@ import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.service.notification.PlayingNotification; import com.dkanada.gramophone.service.notification.PlayingNotificationImpl; import com.dkanada.gramophone.service.notification.PlayingNotificationImpl24; +import com.dkanada.gramophone.service.playback.LocalPlayer; import com.dkanada.gramophone.service.playback.Playback; import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.Util; @@ -208,7 +209,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName()); wakeLock.setReferenceCounted(false); - playback = new MultiPlayer(this); + playback = new LocalPlayer(this); playback.setCallbacks(this); playerHandlerThread = new HandlerThread(PlaybackHandler.class.getName()); diff --git a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java similarity index 95% rename from app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java rename to app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java index d0f5d181..fd076135 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java +++ b/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.service; +package com.dkanada.gramophone.service.playback; import android.content.Context; import android.net.Uri; @@ -7,7 +7,7 @@ import android.widget.Toast; import com.dkanada.gramophone.R; import com.dkanada.gramophone.model.Song; -import com.dkanada.gramophone.service.playback.Playback; +import com.dkanada.gramophone.service.UnknownMediaSourceFactory; import com.dkanada.gramophone.util.MusicUtil; import com.dkanada.gramophone.util.PreferenceUtil; import com.google.android.exoplayer2.ExoPlaybackException; @@ -27,8 +27,8 @@ import com.google.android.exoplayer2.upstream.cache.SimpleCache; import java.io.File; -public class MultiPlayer implements Playback { - public static final String TAG = MultiPlayer.class.getSimpleName(); +public class LocalPlayer implements Playback { + public static final String TAG = LocalPlayer.class.getSimpleName(); private final Context context; private final SimpleExoPlayer exoPlayer; @@ -76,7 +76,7 @@ public class MultiPlayer implements Playback { } }; - public MultiPlayer(Context context) { + public LocalPlayer(Context context) { this.context = context; MediaSourceFactory mediaSourceFactory = new UnknownMediaSourceFactory(buildDataSourceFactory());