mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-01-25 16:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

pip update

Browse Source
This commit is contained in:
Yuriy Liskov
2020-09-24 06:58:02 +03:00
parent d4a1c472ee
commit 05a842f303
3 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
View File

@@ -6,9 +6,6 @@ import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video.State;
import com.liskovsoft.smartyoutubetv2.common.app.models.playback.PlayerEventListenerHelper;
import com.liskovsoft.smartyoutubetv2.common.autoframerate.FormatItem;
import java.util.HashMap;
import java.util.Map;
public class StateUpdater extends PlayerEventListenerHelper {
private boolean mIsPlaying;
private int mRepeatMode = 0;
@@ -18,6 +15,11 @@ public class StateUpdater extends PlayerEventListenerHelper {
@Override
public void openVideo(Video item) {
mIsPlaying = true; // video just added
// Ensure that we aren't running on presenter init stage
if (mController != null) {
saveState();
}
}
@Override

12
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/PlaybackPresenter.java
View File

@@ -52,11 +52,21 @@ public class PlaybackPresenter implements Presenter<PlaybackView> {
public void openVideo(Object parentView, Video item) {
mMainPlayerEventBridge.setParentView(parentView);
mMainPlayerEventBridge.openVideo(item);
mViewManager.startView(PlaybackView.class);
focusView();
}
public void openVideo(String videoId) {
mMainPlayerEventBridge.openVideo(Video.from(videoId));
focusView();
}
private void focusView() {
if (mView != null && mView.getController().isPIPEnabled()) {
return;
}
mViewManager.startView(PlaybackView.class);
}
}

41
smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java
View File

@@ -154,13 +154,12 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
}
public void restartPlayer() {
boolean engineBlocked = isEngineBlocked();
blockEngine(false);
releasePlayer();
initializePlayer();
blockEngine(engineBlocked);
if (mPlayer != null) {
mEventListener.onEngineReleased();
}
destroyPlayerObjects();
createPlayerObjects();
mEventListener.onEngineInitialized();
}
private void releasePlayer() {
@@ -172,13 +171,7 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
if (mPlayer != null) {
Log.d(TAG, "releasePlayer: Start releasing player engine...");
mEventListener.onEngineReleased();
mPlayer.release();
mPlayer = null;
mTrackSelector = null;
mPlayerGlue = null;
mPlayerAdapter = null;
mPlaylistActionListener = null;
mExoPlayerController = null;
destroyPlayerObjects();
}
}
@@ -188,6 +181,24 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
return;
}
createPlayerObjects();
mEventListener.onEngineInitialized();
}
private void destroyPlayerObjects() {
if (mPlayer != null) {
mPlayer.release();
}
mPlayer = null;
mTrackSelector = null;
mPlayerGlue = null;
mPlayerAdapter = null;
mPlaylistActionListener = null;
mExoPlayerController = null;
}
private void createPlayerObjects() {
TrackSelection.Factory videoTrackSelectionFactory =
new AdaptiveTrackSelection.Factory();
mTrackSelector = new RestoreTrackSelector(videoTrackSelectionFactory);
@@ -212,8 +223,6 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
mRowsSupportFragment = (RowsSupportFragment) getChildFragmentManager().findFragmentById(
R.id.playback_controls_dock);
mEventListener.onEngineInitialized();
}
private ArrayObjectAdapter initializeSuggestedVideosRow() {