Skip to content
Snippets Groups Projects

Remove duplicate code from player view controllers

Merged Craig Reyenga requested to merge craig_r/vlc-ios:craig_r/player-dupe into master
All threads resolved!

PlayerViewController and VideoPlayerViewController had some duplicate methods. This MR attempts to merge them appropriately.

PlayerViewController keeps brightness code since most of it lived there anyway, and it's conceivable that a future subclass might want that functionality.

VideoPlayerViewController had two implementations of the same method, which I did not know was possible. I wonder if it is a compiler bug.

Most of this is from !1440 but done more completely and thoughtfully.

Marked as draft due to lack of on-device testing.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Overall it looks good to me, but all the changes made to the deployment target in the project.pbxproj file do not belong in this merge request.

  • Good to be merged once @diogo.simao-marques's remarks are addressed.

  • Craig Reyenga resolved all threads

    resolved all threads

  • Craig Reyenga added 18 commits

    added 18 commits

    • 3e184187...302f244d - 14 commits from branch videolan:master
    • a0a65f78 - Remove unused code from player view controller, and associated classes.
    • 30e2fc80 - Remove duplicate brightness, and method call to set up gestures.
    • 8766189a - Remove other duplicate code from player view controllers, including duplicate...
    • 7d01fc64 - MR feedback

    Compare with previous version

  • Craig Reyenga marked this merge request as ready

    marked this merge request as ready

  • Felix Paul Kühne approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading