diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackOverlayFragment.java b/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackOverlayFragment.java index 6754c2bac..beeb6178f 100644 --- a/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackOverlayFragment.java +++ b/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackOverlayFragment.java @@ -13,6 +13,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; import androidx.leanback.app.RowsSupportFragment; import androidx.leanback.widget.ArrayObjectAdapter; import androidx.leanback.widget.HeaderItem; @@ -288,6 +289,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements IPlayback super.onActivityCreated(savedInstanceState); if (mItemsToPlay == null || mItemsToPlay.size() == 0) return; + prepareOverlayFragment(); mPoster = mActivity.findViewById(R.id.poster); mNextUpPoster = mActivity.findViewById(R.id.nextUpPoster); mStudioImage = mActivity.findViewById(R.id.studioImg); @@ -442,6 +444,14 @@ public class CustomPlaybackOverlayFragment extends Fragment implements IPlayback mPlayPauseBtn.requestFocus(); } + private void prepareOverlayFragment() { + LeanbackOverlayFragment leanbackOverlayFragment = (LeanbackOverlayFragment) getFragmentManager().findFragmentById(R.id.leanback_fragment); + if (leanbackOverlayFragment != null) { + leanbackOverlayFragment.setData(mPlaybackController); + leanbackOverlayFragment.setMediaInfo(); + } + } + private void setupPopupAnimations() { showPopup = AnimationUtils.loadAnimation(mActivity, R.anim.abc_slide_in_bottom); showPopup.setAnimationListener(new Animation.AnimationListener() { diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackTransportControlGlue.java b/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackTransportControlGlue.java new file mode 100644 index 000000000..62adf62ff --- /dev/null +++ b/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackTransportControlGlue.java @@ -0,0 +1,58 @@ +package org.jellyfin.androidtv.playback; + +import android.content.Context; + +import androidx.leanback.media.PlaybackTransportControlGlue; +import androidx.leanback.media.PlayerAdapter; +import androidx.leanback.widget.Action; +import androidx.leanback.widget.ArrayObjectAdapter; +import androidx.leanback.widget.PlaybackControlsRow; +import androidx.leanback.widget.PlaybackRowPresenter; + +public class CustomPlaybackTransportControlGlue extends PlaybackTransportControlGlue { + + private PlaybackControlsRow.PlayPauseAction playPauseAction; + private PlaybackControlsRow.RewindAction rewindAction; + private PlaybackControlsRow.FastForwardAction fastForwardAction; + + private PlaybackControlsRow.ClosedCaptioningAction closedCaptioningAction; + private PlaybackControlsRow.RepeatAction repeatAction; + private PlaybackControlsRow.ShuffleAction shuffleAction; + + private final PlaybackController playbackController; + + + CustomPlaybackTransportControlGlue(Context context, PlayerAdapter playerAdapter, PlaybackController playbackController) { + super(context, playerAdapter); + this.playbackController = playbackController; + } +/* + @Override + protected void onCreatePrimaryActions(ArrayObjectAdapter primaryActionsAdapter) { + primaryActionsAdapter.add(rewindAction); + primaryActionsAdapter.add(playPauseAction); + primaryActionsAdapter.add(fastForwardAction); + } + + @Override + protected void onCreateSecondaryActions(ArrayObjectAdapter secondaryActionsAdapter) { + secondaryActionsAdapter.add(closedCaptioningAction); + secondaryActionsAdapter.add(repeatAction); + secondaryActionsAdapter.add(shuffleAction); + } + + @Override + public void onActionClicked(Action action) { + if (action == playPauseAction) { + if (getPlayerAdapter().isPlaying()) { + getPlayerAdapter().play(); + } else { + getPlayerAdapter().pause(); + } + } else if (action == rewindAction) { + getPlayerAdapter().rewind(); + } else if (action == fastForwardAction) { + getPlayerAdapter().fastForward(); + } + }*/ +} diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/CustomSeekProvider.java b/app/src/main/java/org/jellyfin/androidtv/playback/CustomSeekProvider.java new file mode 100644 index 000000000..a46c4e074 --- /dev/null +++ b/app/src/main/java/org/jellyfin/androidtv/playback/CustomSeekProvider.java @@ -0,0 +1,11 @@ +package org.jellyfin.androidtv.playback; + +import androidx.leanback.widget.PlaybackSeekDataProvider; + +public class CustomSeekProvider extends PlaybackSeekDataProvider { + + @Override + public long[] getSeekPositions() { + return new long[5]; + } +} diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/LeanbackOverlayFragment.java b/app/src/main/java/org/jellyfin/androidtv/playback/LeanbackOverlayFragment.java new file mode 100644 index 000000000..81167e385 --- /dev/null +++ b/app/src/main/java/org/jellyfin/androidtv/playback/LeanbackOverlayFragment.java @@ -0,0 +1,43 @@ +package org.jellyfin.androidtv.playback; + +import android.net.Uri; +import android.os.Bundle; + +import androidx.leanback.app.PlaybackSupportFragment; +import androidx.leanback.app.PlaybackSupportFragmentGlueHost; +import androidx.leanback.app.VideoSupportFragment; +import androidx.leanback.app.VideoSupportFragmentGlueHost; +import androidx.leanback.media.MediaPlayerAdapter; +import androidx.leanback.media.PlaybackGlue; +import androidx.leanback.media.PlaybackTransportControlGlue; +import androidx.leanback.media.PlayerAdapter; + +import org.jellyfin.androidtv.TvApp; +import org.jellyfin.apiclient.model.dto.BaseItemDto; + +public class LeanbackOverlayFragment extends PlaybackSupportFragment { + + PlaybackController playbackController; + PlaybackTransportControlGlue playerGlue; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + TvApp application = TvApp.getApplication(); + PlaybackController playbackController = application.getPlaybackController(); + + playerGlue = new CustomPlaybackTransportControlGlue(getContext(), new VideoPlayerAdapter(playbackController), playbackController); + playerGlue.setHost(new PlaybackSupportFragmentGlueHost(this)); + } + + public void setData(PlaybackController playbackController) { + this.playbackController = playbackController; + } + + public void setMediaInfo() { + BaseItemDto currentlyPlayingItem = playbackController.getCurrentlyPlayingItem(); + + playerGlue.setTitle(currentlyPlayingItem.getOriginalTitle()); + } +} diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java index 9c7e7e348..4252e0d0a 100644 --- a/app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java +++ b/app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java @@ -871,7 +871,7 @@ public class PlaybackController { if (mVideoManager.isNativeMode() && !isLiveTv && ContainerTypes.TS.equals(mCurrentStreamInfo.getContainer())) { //Exo does not support seeking in .ts Utils.showToast(TvApp.getApplication(), "Unable to seek"); - } else if (mVideoManager.seekTo(pos) >= 0) { + } else if (mVideoManager.seekToPosition(pos) >= 0) { if (mFragment != null) { mFragment.updateEndTime(mVideoManager.getDuration() - pos); } @@ -1011,7 +1011,7 @@ public class PlaybackController { mHandler.postDelayed(this, 25); } else { // do the seek - if (mVideoManager.seekTo(position) < 0) + if (mVideoManager.seekToPosition(position) < 0) Utils.showToast(TvApp.getApplication(), "Unable to seek"); mPlaybackState = PlaybackState.PLAYING; diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/VideoManager.java b/app/src/main/java/org/jellyfin/androidtv/playback/VideoManager.java index 1d8712db2..6f8413d97 100644 --- a/app/src/main/java/org/jellyfin/androidtv/playback/VideoManager.java +++ b/app/src/main/java/org/jellyfin/androidtv/playback/VideoManager.java @@ -12,6 +12,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.leanback.media.PlayerAdapter; + import com.devbrackets.android.exomedia.EMVideoView; import org.jellyfin.androidtv.R; @@ -29,7 +31,7 @@ import org.jellyfin.apiclient.model.dto.MediaSourceInfo; import org.jellyfin.apiclient.model.entities.MediaStream; import org.jellyfin.apiclient.model.entities.MediaStreamType; -public class VideoManager implements IVLCVout.OnNewVideoLayoutListener { +public class VideoManager extends PlayerAdapter implements IVLCVout.OnNewVideoLayoutListener { public final static int ZOOM_NORMAL = 0; public final static int ZOOM_VERTICAL = 1; @@ -220,7 +222,7 @@ public class VideoManager implements IVLCVout.OnNewVideoLayoutListener { stopProgressLoop(); } - public long seekTo(long pos) { + public long seekToPosition(long pos) { if (nativeMode) { Long intPos = pos; TvApp.getApplication().getLogger().Info("Exo length in seek is: " + mVideoView.getDuration()); @@ -712,4 +714,6 @@ public class VideoManager implements IVLCVout.OnNewVideoLayoutListener { } return ourIndex; } + + } diff --git a/app/src/main/java/org/jellyfin/androidtv/playback/VideoPlayerAdapter.java b/app/src/main/java/org/jellyfin/androidtv/playback/VideoPlayerAdapter.java new file mode 100644 index 000000000..a1bc8bab7 --- /dev/null +++ b/app/src/main/java/org/jellyfin/androidtv/playback/VideoPlayerAdapter.java @@ -0,0 +1,40 @@ +package org.jellyfin.androidtv.playback; + +import androidx.leanback.media.PlayerAdapter; + +public class VideoPlayerAdapter extends PlayerAdapter { + + private final PlaybackController playbackController; + + public VideoPlayerAdapter(PlaybackController playbackController) { + this.playbackController = playbackController; + } + + @Override + public void play() { + playbackController.play(playbackController.getCurrentPosition()); + } + + @Override + public void pause() { + playbackController.pause(); + } + + @Override + public long getDuration() { + return playbackController.getCurrentlyPlayingItem().getRunTimeTicks()!= null ? + playbackController.getCurrentlyPlayingItem().getRunTimeTicks() / 10000 : -1; + } + + @Override + public long getCurrentPosition() { + return playbackController.getCurrentPosition(); + } + + @Override + public boolean isPlaying() { + return playbackController.isPlaying(); + } + + +} diff --git a/app/src/main/res/layout/vlc_player_interface.xml b/app/src/main/res/layout/vlc_player_interface.xml index 63ef7a2a6..8d93674ca 100644 --- a/app/src/main/res/layout/vlc_player_interface.xml +++ b/app/src/main/res/layout/vlc_player_interface.xml @@ -8,7 +8,7 @@ + android:fitsSystemWindows="false"> - @@ -29,156 +30,167 @@ - - + + + + + + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_gravity="center_horizontal|bottom" + android:focusable="false" + android:focusableInTouchMode="false" + android:visibility="gone"> + android:layout_centerHorizontal="true" + android:alpha=".65" + android:background="@color/black" /> + android:maxLines="1" + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:alpha=".6" + android:textAppearance="?android:attr/textAppearanceMedium" /> + android:measureWithLargestChild="false" + android:minHeight="30sp" + android:orientation="horizontal" /> + android:visibility="invisible" /> + android:layout_alignParentBottom="false" + android:layout_marginLeft="325sp" + android:layout_marginTop="20sp" + android:maxHeight="5sp" + android:minWidth="525sp" /> + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="16sp" + tools:text="1:23:00" /> + android:layout_toRightOf="@+id/playerProgress" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="16sp" + tools:text="-1:25:00" /> + android:layout_marginRight="30sp" /> - + android:layout_gravity="bottom" /> + android:layout_centerHorizontal="true" + android:alpha=".95" + android:background="@color/black" /> + android:maxLines="1" + android:text="Large Text" + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:measureWithLargestChild="false" + android:minHeight="30sp" + android:orientation="horizontal" /> + android:layout_alignParentEnd="true" + android:layout_marginRight="40sp" + android:text="" + android:textSize="18sp" /> - -