Merged 'dev' branch

app/src/main/java/org/schabi/newpipe/player/BasePlayer.java

@@ -1410,6 +1410,11 @@ public abstract class BasePlayer implements
         return currentMetadata;
     }
 
+    @NonNull
+    public LoadController getLoadController() {
+        return (LoadController) loadControl;
+    }
+
     @NonNull
     public String getVideoUrl() {
         return currentMetadata == null

app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java

@@ -1485,6 +1485,10 @@ public class VideoPlayerImpl extends VideoPlayer
         }
     }
 
+    public void disablePreloadingOfCurrentTrack() {
+        getLoadController().disablePreloadingOfCurrentTrack();
+    }
+
     protected void setMuteButton(final ImageButton button, final boolean isMuted) {
         button.setImageDrawable(AppCompatResources.getDrawable(service, isMuted
                 ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));

app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java

@@ -13,6 +13,7 @@ public class LoadController implements LoadControl {
 
     private final long initialPlaybackBufferUs;
     private final LoadControl internalLoadControl;
+    private boolean preloadingEnabled = true;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Default Load Control
@@ -41,6 +42,7 @@ public class LoadController implements LoadControl {
 
     @Override
     public void onPrepared() {
+        preloadingEnabled = true;
         internalLoadControl.onPrepared();
     }
 
@@ -52,11 +54,13 @@ public class LoadController implements LoadControl {
 
     @Override
     public void onStopped() {
+        preloadingEnabled = true;
         internalLoadControl.onStopped();
     }
 
     @Override
     public void onReleased() {
+        preloadingEnabled = true;
         internalLoadControl.onReleased();
     }
 
@@ -78,6 +82,9 @@ public class LoadController implements LoadControl {
     @Override
     public boolean shouldContinueLoading(final long bufferedDurationUs,
                                          final float playbackSpeed) {
+        if (!preloadingEnabled) {
+            return false;
+        }
         return internalLoadControl.shouldContinueLoading(bufferedDurationUs, playbackSpeed);
     }
 
@@ -90,4 +97,8 @@ public class LoadController implements LoadControl {
                 .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
         return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
     }
+
+    public void disablePreloadingOfCurrentTrack() {
+        preloadingEnabled = false;
+    }
 }