Merge player classes into a single one #5371

Stypox · 2021-01-08T19:57:25Z

What is it?

Bugfix (user facing)
Feature (user facing)
Codebase improvement (dev facing)
Meta improvement to the project (dev facing)

Description of the changes in your PR

This PR merges the three files of the player, namely BasePlayer, VideoPlayer and VideoPlayerImpl, into only one. Having three files was totally useless since code randomly spanned across all three files without any clear distinction. Before unified player three different classes were needed to allow for extension, but now that's not needed anymore. Merging everything together also removes lines of code and makes the code simpler to read, since everything is in one place, as there are no overridden methods all over the place anymore.

Create different sections inside the file with big title comments, grouping together related functions. Add //region and //endregion comments before and after each section, allowing them to be folded by the IDE.
Use only one enum for player type, also for intents, and therefore use intvalue = type.ordinal() and PlayerType.values()[intvalue]
Remove some unused functions
Move utility functions and functions that use preferences toPlayerHelper
Change checkPopupPositionBounds so that it tries to clamp both x and y bounds and not only one at a time
Fix wrong speed indicator in queue activity (finally I understood what ought to be done)
Remove viewpager hiding from In Fullscreen playback, toggle play/pause with hardware space button #5331
Fix view types different between player.xml and player.xml (large-land), causing view binding to require conversions: see Use view binding in VideoPlayer. #5253 (comment)
Merge ServicePlayerActivity and BackgroundPlayerActivity into a single PlayQueueActivity and remove useless fields getTag and redraw (which were not used)

I'd like this to be merged soon, otherwise it will be a mess to rebase.

Due diligence

I read the contribution guidelines.

opusforlife2 · 2021-01-08T23:07:50Z

This has been bugging you for a while, hasn't it? xD

Redirion · 2021-01-09T08:21:23Z

as your PR also modifies the VideoDetailFragment. Can you please remove the lines

NewPipe/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

Line 1892 in d726546

viewPager.setVisibility(View.GONE);

and

NewPipe/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

Line 1895 in d726546

viewPager.setVisibility(View.VISIBLE);

that's from PR #5331. So I don't have to do that in another PR and force you to rebase / force push.

vkay94 · 2021-01-09T11:18:26Z

I'm in favor of this :) It's always a struggle to "not breaking" stuff because of the super-calls, especially for methods like showControls and hideControls - requires a check on all classes - plus most (even if not all) of the UI component getters can be/are removed ^^

XiangRongLin

I just did a quick run down, i skipped Player since there is no direct side-by-side comparison. But if you just pulled the methods upwards there shouldn't be much to look at.
PlayerHelper i also just skimmed through for the same reason.

Only thing that i would change is making seperate commits for those points. When looked at afterwards it then shows that its intended and not accidental.

Fix wrong speed indicator in queue activity (finally I understood what ought to be done)
Remove viewpager hiding from #5331

XiangRongLin · 2021-01-09T14:20:07Z

app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java

@@ -33,61 +33,59 @@
 public class PlayerGestureListener
        extends BasePlayerGestureListener
        implements View.OnTouchListener {
-    private static final String TAG = ".PlayerGestureListener";
-    private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final String TAG = PlayerGestureListener.class.getSimpleName();


Is this done like this in other places too?

Yes, this is the way to do it

XiangRongLin · 2021-01-09T14:22:41Z

app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java

@@ -129,6 +128,7 @@ public boolean onCreateOptionsMenu(final Menu m) {
        getMenuInflater().inflate(R.menu.menu_play_queue, m);
        getMenuInflater().inflate(getPlayerOptionMenuResource(), m);
        onMaybeMuteChanged();
+        onPlaybackParameterChanged(player.getPlaybackParameters());


Where is this coming from?

This fixes the issue with the speed on the button being wrong

avently · 2021-01-09T20:35:17Z

Isn't it quite hard to navigate in 4k lines of code?
This seems like a logical step forward. Maybe someone will find a way to divide the file into the pieces without direct connection so they can do it's job without touching other classes

TacoTheDank · 2021-01-12T16:05:04Z

Isn't it quite hard to navigate in 4k lines of code?
This seems like a logical step forward. Maybe someone will find a way to divide the file into the pieces without direct connection so they can do it's job without touching other classes

Paging @XiangRongLin :)

XiangRongLin · 2021-01-12T18:53:55Z

@TacoTheDank Seeing how my other refactoring&tests PR are still just lying around, I'm not going to touch this. Refactoring something big like this needs many iterations, which does not work if each iteration has a very long wait time just to get feedback.

Stypox · 2021-01-12T20:18:03Z

@XiangRongLin I separated the commits as you requested, and also merged and renamed ServicePlayerActivity into PlayQueueActivity

XiangRongLin

Looks ok to me. I trust you with merging those classes, since like many said 4k lines is too much to review.

opusforlife2 · 2021-01-13T18:28:42Z

Seeing how my other refactoring&tests PR are still just lying around, I'm not going to touch this. Refactoring something big like this needs many iterations, which does not work if each iteration has a very long wait time just to get feedback.

Yes, this is a chronic problem because of general lack of free time on the team. Plus even when a dev gets some time to work on Newpipe, they might have their own priority regarding what to work on.

@XiangRongLin @vkay94 You've both been given write access, so you can approve and merge PRs. Whenever you have the inclination, please go ahead and review/merge PRs that meet your standards. :)

Also, @XiangRongLin could you please join the newpipe IRC channel (preferably with a Matrix account)? @vkay94 is already there.

Redirion · 2021-01-14T09:18:57Z

player.getPlayer() or player.isPlayerNull are looking a bit unfortunate. Maybe it should be renamed to exoInstance / playbackInstance or something like that? so it would become player.getExoInstance() and player.isExoInstanceNull

Stypox · 2021-01-14T09:29:37Z

I rebased onto view binding and tested again, everything seems to be working fine. @Redirion I renamed playerIsNull into exoPlayerIsNull, is that ok? I don't know, though, what you are referring to with player.getPlayer, as there is no such method anymore. @Isira-Seneviratne I was able to solve the problem with incompatible view binding types by making sure the same view types are used in player.xml and player.xml (large-land)

Redirion

lgtm

Redirion · 2021-01-14T09:43:03Z

I will take the bold move to merge this. I think this should go into public testing with the new release. This will give us the opportunity to collect more broad feedback.

Merge player classes into a single one

triallax added the player Issues related to any player (main, popup and background) label Jan 8, 2021

Stypox force-pushed the merge-player branch from d726546 to 681c761 Compare January 9, 2021 13:30

XiangRongLin reviewed Jan 9, 2021

View reviewed changes

Stypox force-pushed the merge-player branch from 681c761 to e34c566 Compare January 12, 2021 20:17

XiangRongLin previously approved these changes Jan 13, 2021

View reviewed changes

Stypox dismissed XiangRongLin’s stale review via 5fa8f97 January 13, 2021 19:27

Stypox force-pushed the merge-player branch from e34c566 to 5fa8f97 Compare January 13, 2021 19:27

Stypox force-pushed the merge-player branch from 5fa8f97 to b17b3af Compare January 14, 2021 09:19

Stypox added 5 commits January 14, 2021 10:25

Merge player classes into a single one

f6e2dd1

Revert hiding detail fragment tabs when in fullscreen

4a12b0a

Fix wrong speed indicator in queue activity

cece833

Merge and rename into PlayQueueActivity

059bb76

Fix view binding types

8378789

Stypox force-pushed the merge-player branch from b17b3af to 8378789 Compare January 14, 2021 09:25

Redirion approved these changes Jan 14, 2021

View reviewed changes

Redirion merged commit c90696e into TeamNewPipe:dev Jan 14, 2021

Stypox mentioned this pull request Jan 14, 2021

Add stream segments to player controls #5274

Merged

5 tasks

This was referenced Jan 18, 2021

Release 0.20.10 #5455

Closed

Release 0.20.10 #5456

Merged

ghost mentioned this pull request Apr 11, 2021

request on when a future update of the legacy version of newpiepe will arrive TeamNewPipe/NewPipe-legacy#72

Open

tossj pushed a commit to tossj/NewPipe-legacy that referenced this pull request Apr 20, 2021

Merge pull request TeamNewPipe/NewPipe#5371 from Stypox/merge-player

6dbf27a

Merge player classes into a single one

Stypox deleted the merge-player branch August 4, 2022 09:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge player classes into a single one #5371

Merge player classes into a single one #5371

Stypox commented Jan 8, 2021 •

edited

opusforlife2 commented Jan 8, 2021

Redirion commented Jan 9, 2021

vkay94 commented Jan 9, 2021 •

edited

XiangRongLin left a comment

XiangRongLin Jan 9, 2021

Stypox Jan 9, 2021

XiangRongLin Jan 9, 2021

Stypox Jan 9, 2021

avently commented Jan 9, 2021

TacoTheDank commented Jan 12, 2021

XiangRongLin commented Jan 12, 2021

Stypox commented Jan 12, 2021

XiangRongLin left a comment

opusforlife2 commented Jan 13, 2021

Redirion commented Jan 14, 2021 •

edited

Stypox commented Jan 14, 2021 •

edited

Redirion left a comment

Redirion commented Jan 14, 2021

Merge player classes into a single one #5371

Merge player classes into a single one #5371

Conversation

Stypox commented Jan 8, 2021 • edited

What is it?

Description of the changes in your PR

Due diligence

opusforlife2 commented Jan 8, 2021

Redirion commented Jan 9, 2021

vkay94 commented Jan 9, 2021 • edited

XiangRongLin left a comment

Choose a reason for hiding this comment

XiangRongLin Jan 9, 2021

Choose a reason for hiding this comment

Stypox Jan 9, 2021

Choose a reason for hiding this comment

XiangRongLin Jan 9, 2021

Choose a reason for hiding this comment

Stypox Jan 9, 2021

Choose a reason for hiding this comment

avently commented Jan 9, 2021

TacoTheDank commented Jan 12, 2021

XiangRongLin commented Jan 12, 2021

Stypox commented Jan 12, 2021

XiangRongLin left a comment

Choose a reason for hiding this comment

opusforlife2 commented Jan 13, 2021

Redirion commented Jan 14, 2021 • edited

Stypox commented Jan 14, 2021 • edited

Redirion left a comment

Choose a reason for hiding this comment

Redirion commented Jan 14, 2021

Stypox commented Jan 8, 2021 •

edited

vkay94 commented Jan 9, 2021 •

edited

Redirion commented Jan 14, 2021 •

edited

Stypox commented Jan 14, 2021 •

edited