mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-05-13 00:10:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

player: remove watch stream end code & enable screensaver on buffering

Browse Source
This commit is contained in:
Yuriy Liskov
2022-08-02 03:47:29 +03:00
parent bf228fde17
commit ebdfe2e501
2 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoLoaderManager.java
+1 -43
View File
@@ -55,16 +55,6 @@ public class VideoLoaderManager extends PlayerEventListenerHelper {
getController().restartEngine(); // properly save position of the current track
}
};
private final Runnable mStopLiveStream = () -> {
if (getController() != null &&
getController().getVideo() != null &&
getController().getVideo().isLive) {
// Do rewind ten sec to stop buffering
getController().setPositionMs(getController().getPositionMs() - 10_000);
getController().setPlayWhenReady(false);
getController().showControls(true);
}
};
public VideoLoaderManager(SuggestionsLoaderManager suggestionsLoader) {
mSuggestionsLoader = suggestionsLoader;
@@ -126,18 +116,6 @@ public class VideoLoaderManager extends PlayerEventListenerHelper {
mLastError = -1;
}
@Override
public void onBuffering() {
// Fix long buffering (indicates end of the stream)
watchLiveStream();
}
@Override
public void onPlay() {
// Seems fine. Buffering is gone.
unwatchLiveStream();
}
@Override
public boolean onPreviousClicked() {
loadPrevious();
@@ -353,7 +331,7 @@ public class VideoLoaderManager extends PlayerEventListenerHelper {
private void disposeActions() {
RxUtils.disposeActions(mFormatInfoAction, mMpdStreamAction);
Utils.removeCallbacks(mHandler, mReloadVideoHandler, mPendingRestartEngine, mPendingNext, mStopLiveStream);
Utils.removeCallbacks(mHandler, mReloadVideoHandler, mPendingRestartEngine, mPendingNext);
}
private void initErrorActions() {
@@ -455,24 +433,4 @@ public class VideoLoaderManager extends PlayerEventListenerHelper {
Log.e(TAG, "Undetected repeat mode " + playbackMode);
}
/**
* Stop on long buffering (indicates end of the stream)
*/
private void watchLiveStream() {
unwatchLiveStream();
if (getController() != null &&
getController().getVideo() != null &&
getController().getVideo().isLive) {
Utils.postDelayed(mHandler, mStopLiveStream, 2 * 60 * 1_000);
}
}
/**
* Cancel stream buffering check
*/
private void unwatchLiveStream() {
Utils.removeCallbacks(mHandler, mPendingRestartEngine, mStopLiveStream);
}
}
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoStateManager.java
+3 -2
View File
@@ -170,15 +170,15 @@ public class VideoStateManager extends PlayerEventListenerHelper implements Tick
@Override
public void onPlay() {
showHideScreensaver(false);
setPlayEnabled(true);
showHideScreensaver(false);
}
@Override
public void onPause() {
showHideScreensaver(true);
setPlayEnabled(false);
//saveState();
showHideScreensaver(true);
}
@Override
@@ -209,6 +209,7 @@ public class VideoStateManager extends PlayerEventListenerHelper implements Tick
public void onBuffering() {
// Check LIVE threshold and set speed to normal
restoreSpeed();
showHideScreensaver(true);
}
@Override