change repeat type to enum for three values

sma6871 · Sep 5, 2018 · 11b2260 · 11b2260
1 parent 9513088
commit 11b2260
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/dmaudiostreamer/src/main/java/dm/audiostreamer/AudioStreamingManager.java b/dmaudiostreamer/src/main/java/dm/audiostreamer/AudioStreamingManager.java
@@ -20,6 +20,8 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import static dm.audiostreamer.RepeatType.*;
+
 public class AudioStreamingManager extends StreamingManager {
     private static final String TAG = Logger.makeLogTag(AudioStreamingManager.class);
 
@@ -34,7 +36,7 @@ public class AudioStreamingManager extends StreamingManager {
     private MediaMetaData currentAudio;
     private List<MediaMetaData> mediaList = new ArrayList<>();
     public static volatile Handler applicationHandler = null;
-    private boolean repeatEnable = false;
+    private RepeatType repeatType = NONE;
     private boolean shuffleEnable = false;
 
 
@@ -71,12 +73,12 @@ public String getCurrentAudioId() {
         return currentAudio != null ? currentAudio.getMediaId() : "";
     }
 
-    public void setRepeatEnable(boolean repeatEnable) {
-        this.repeatEnable = repeatEnable;
+    public void setRepeatType(RepeatType repeatType) {
+        this.repeatType = repeatType;
     }
 
-    public boolean isRepeatEnable() {
-        return repeatEnable;
+    public RepeatType getRepeatType() {
+        return repeatType;
     }
 
     public void setShuffleEnable(boolean shuffleEnable) {
@@ -167,10 +169,12 @@ public int lastSeekPosition() {
     @Override
     public void onSkipToNext() {
         int nextIndex = index + 1;
-        if (shuffleEnable)
+        if (repeatType == SINGLE)
+            nextIndex = index;
+        else if (shuffleEnable)
             nextIndex = getRandomIndex();
         if (!isValidIndex(true, nextIndex))
-            if (repeatEnable)
+            if (repeatType == ALL)
                 nextIndex = 0;
             else return;
 
@@ -187,10 +191,12 @@ public void onSkipToNext() {
     @Override
     public void onSkipToPrevious() {
         int prvIndex = index - 1;
-        if (shuffleEnable)
+        if (repeatType == SINGLE)
+            prvIndex = index;
+        else if (shuffleEnable)
             prvIndex = getRandomIndex();
         if (!isValidIndex(true, prvIndex))
-            if (repeatEnable)
+            if (repeatType == ALL)
                 prvIndex = mediaList.size() - 1;
             else return;
 

diff --git a/dmaudiostreamer/src/main/java/dm/audiostreamer/RepeatType.java b/dmaudiostreamer/src/main/java/dm/audiostreamer/RepeatType.java
@@ -0,0 +1,5 @@
+package dm.audiostreamer;
+
+public enum RepeatType {
+    NONE, SINGLE, ALL
+}