android/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2025-05-17 19:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

video card: playback preview: upd 3

Browse Source
This commit is contained in:
Yuriy Liskov
2025-05-16 05:34:19 +03:00
parent ac647acab8
commit 9f91e91240
6 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaServiceCore

Submodule MediaServiceCore updated: 9c4ff21c8f...e884fe7474

2
SharedModules

Submodule SharedModules updated: 8779095e1e...ceddf20cfe

4
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java
View File

@ -654,6 +654,10 @@ public class VideoLoaderController extends BasePlayerController implements OnDat
return; return;
} }
if (video.embedPlayer) {
playbackMode = PlayerConstants.PLAYBACK_MODE_CLOSE;
}
switch (playbackMode) { switch (playbackMode) {
case PlayerConstants.PLAYBACK_MODE_REVERSE_LIST: case PlayerConstants.PLAYBACK_MODE_REVERSE_LIST:
if (video.hasPlaylist() || video.belongsToChannelUploads() || video.belongsToChannel()) { if (video.hasPlaylist() || video.belongsToChannelUploads() || video.belongsToChannel()) {

10
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
View File

@ -385,7 +385,8 @@ public class VideoStateController extends BasePlayerController {
} }
public void saveState() { public void saveState() {
if (getVideo() != null && getVideo().embedPlayer) { // Skip mini player, but don't save for the previews (mute enabled)
if (isEmbedMuted()) {
return; return;
} }
@ -405,7 +406,8 @@ public class VideoStateController extends BasePlayerController {
} }
private void persistState() { private void persistState() {
if (getVideo() != null && getVideo().embedPlayer) { // Skip mini player, but don't save for the previews (mute enabled)
if (isEmbedMuted()) {
return; return;
} }
@ -652,4 +654,8 @@ public class VideoStateController extends BasePlayerController {
} }
} }
} }
private boolean isEmbedMuted() {
return getVideo() != null && getPlayer() != null && getVideo().embedPlayer && Helpers.floatEquals(getPlayer().getVolume(), 0);
}
} }

2
smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/complexcardview/ComplexImageView.java
View File

@ -163,7 +163,7 @@ public class ComplexImageView extends RelativeLayout {
mPreviewContainer.setVisibility(View.VISIBLE); mPreviewContainer.setVisibility(View.VISIBLE);
} }
mPreviewPlayer.openVideo(getVideo().copy()); mPreviewPlayer.openVideo(getVideo());
} }
public void stopPlayback() { public void stopPlayback() {

20
smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/embedplayer/EmbedPlayerView.java
View File

@ -255,7 +255,7 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
@Override @Override
public void finishReally() { public void finishReally() {
finish();
} }
@Override @Override
@ -403,9 +403,13 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
@Override @Override
public boolean containsMedia() { public boolean containsMedia() {
if (mExoPlayerController == null) {
return false; return false;
} }
return mExoPlayerController.containsMedia();
}
@Override @Override
public void setSpeed(float speed) { public void setSpeed(float speed) {
if (mExoPlayerController != null) { if (mExoPlayerController != null) {
@ -424,12 +428,18 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
@Override @Override
public void setPitch(float pitch) { public void setPitch(float pitch) {
if (mExoPlayerController != null) {
mExoPlayerController.setPitch(pitch);
}
} }
@Override @Override
public float getPitch() { public float getPitch() {
return 0; if (mExoPlayerController == null) {
return 1f;
}
return mExoPlayerController.getPitch();
} }
@Override @Override
@ -549,6 +559,10 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
mExoPlayerController.release(); mExoPlayerController.release();
mPlayer = null; mPlayer = null;
setPlayer(null); setPlayer(null);
hideView();
if (mVideo != null) {
mVideo.embedPlayer = false;
}
} }
} }