tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move MultiPlayer class to playback directory

Browse source
This commit is contained in:
dkanada 2021-03-09 01:31:58 +09:00
commit 1bd6f4cb04
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/dkanada/gramophone/service/MusicService.java
View file

@ -45,6 +45,7 @@ import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.notification.PlayingNotification; import com.dkanada.gramophone.service.notification.PlayingNotification;
import com.dkanada.gramophone.service.notification.PlayingNotificationImpl; import com.dkanada.gramophone.service.notification.PlayingNotificationImpl;
import com.dkanada.gramophone.service.notification.PlayingNotificationImpl24; 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.service.playback.Playback;
import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.Util; 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 = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
wakeLock.setReferenceCounted(false); wakeLock.setReferenceCounted(false);
playback = new MultiPlayer(this); playback = new LocalPlayer(this);
playback.setCallbacks(this); playback.setCallbacks(this);
playerHandlerThread = new HandlerThread(PlaybackHandler.class.getName()); playerHandlerThread = new HandlerThread(PlaybackHandler.class.getName());

10
app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java → app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.service; package com.dkanada.gramophone.service.playback;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
@ -7,7 +7,7 @@ import android.widget.Toast;
import com.dkanada.gramophone.R; import com.dkanada.gramophone.R;
import com.dkanada.gramophone.model.Song; 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.MusicUtil;
import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.PreferenceUtil;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
@ -27,8 +27,8 @@ import com.google.android.exoplayer2.upstream.cache.SimpleCache;
import java.io.File; import java.io.File;
public class MultiPlayer implements Playback { public class LocalPlayer implements Playback {
public static final String TAG = MultiPlayer.class.getSimpleName(); public static final String TAG = LocalPlayer.class.getSimpleName();
private final Context context; private final Context context;
private final SimpleExoPlayer exoPlayer; private final SimpleExoPlayer exoPlayer;
@ -76,7 +76,7 @@ public class MultiPlayer implements Playback {
} }
}; };
public MultiPlayer(Context context) { public LocalPlayer(Context context) {
this.context = context; this.context = context;
MediaSourceFactory mediaSourceFactory = new UnknownMediaSourceFactory(buildDataSourceFactory()); MediaSourceFactory mediaSourceFactory = new UnknownMediaSourceFactory(buildDataSourceFactory());