mirror of
https://github.com/yuliskov/SmartTube.git
synced 2025-05-17 03:15:56 +08:00
video card: playback preview: upd 3
This commit is contained in:
Submodule MediaServiceCore updated: 9c4ff21c8f...e884fe7474
Submodule SharedModules updated: 8779095e1e...ceddf20cfe
@ -654,6 +654,10 @@ public class VideoLoaderController extends BasePlayerController implements OnDat
|
||||
return;
|
||||
}
|
||||
|
||||
if (video.embedPlayer) {
|
||||
playbackMode = PlayerConstants.PLAYBACK_MODE_CLOSE;
|
||||
}
|
||||
|
||||
switch (playbackMode) {
|
||||
case PlayerConstants.PLAYBACK_MODE_REVERSE_LIST:
|
||||
if (video.hasPlaylist() || video.belongsToChannelUploads() || video.belongsToChannel()) {
|
||||
|
@ -385,7 +385,8 @@ public class VideoStateController extends BasePlayerController {
|
||||
}
|
||||
|
||||
public void saveState() {
|
||||
if (getVideo() != null && getVideo().embedPlayer) {
|
||||
// Skip mini player, but don't save for the previews (mute enabled)
|
||||
if (isEmbedMuted()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -405,7 +406,8 @@ public class VideoStateController extends BasePlayerController {
|
||||
}
|
||||
|
||||
private void persistState() {
|
||||
if (getVideo() != null && getVideo().embedPlayer) {
|
||||
// Skip mini player, but don't save for the previews (mute enabled)
|
||||
if (isEmbedMuted()) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
@ -163,7 +163,7 @@ public class ComplexImageView extends RelativeLayout {
|
||||
mPreviewContainer.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
mPreviewPlayer.openVideo(getVideo().copy());
|
||||
mPreviewPlayer.openVideo(getVideo());
|
||||
}
|
||||
|
||||
public void stopPlayback() {
|
||||
|
@ -255,7 +255,7 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
|
||||
|
||||
@Override
|
||||
public void finishReally() {
|
||||
|
||||
finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -403,7 +403,11 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
|
||||
|
||||
@Override
|
||||
public boolean containsMedia() {
|
||||
return false;
|
||||
if (mExoPlayerController == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mExoPlayerController.containsMedia();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -424,12 +428,18 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
|
||||
|
||||
@Override
|
||||
public void setPitch(float pitch) {
|
||||
|
||||
if (mExoPlayerController != null) {
|
||||
mExoPlayerController.setPitch(pitch);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPitch() {
|
||||
return 0;
|
||||
if (mExoPlayerController == null) {
|
||||
return 1f;
|
||||
}
|
||||
|
||||
return mExoPlayerController.getPitch();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -549,6 +559,10 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView {
|
||||
mExoPlayerController.release();
|
||||
mPlayer = null;
|
||||
setPlayer(null);
|
||||
hideView();
|
||||
if (mVideo != null) {
|
||||
mVideo.embedPlayer = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user