Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic Media Session UI for Hololens #24927

Merged
merged 5 commits into from Dec 5, 2019
Merged

Basic Media Session UI for Hololens #24927

merged 5 commits into from Dec 5, 2019

Conversation

@ferjm
Copy link
Member

ferjm commented Nov 29, 2019

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #24807

This PR implements a extremely basic Media Session UI. The media controls are part of the main window, which is not very nice, but it is what we can do until #24873 is done.
@ferjm
Copy link
Member Author

ferjm commented Nov 29, 2019

r? @paulrouget
@highfive highfive assigned paulrouget and unassigned nox Nov 29, 2019
@ferjm
Copy link
Member Author

ferjm commented Nov 29, 2019

This is a short video running in the Hololens emulator https://vimeo.com/376384891
@paulrouget
Copy link
Contributor

paulrouget commented Dec 2, 2019

This is great :)

Can you make it so MediaSession.h is not necessary? Maybe look at how CMouseButton work?
@paulrouget paulrouget mentioned this pull request Dec 2, 2019
Open
@ferjm ferjm force-pushed the ferjm:hololens.mediasession branch 2 times, most recently from efba08b to 7551977 Dec 2, 2019
@paulrouget
Copy link
Contributor

paulrouget commented Dec 3, 2019

r=me with mach fmt.
@ferjm ferjm force-pushed the ferjm:hololens.mediasession branch from b0a8e89 to de90274 Dec 3, 2019
@ferjm
Copy link
Member Author

ferjm commented Dec 3, 2019

@bors-servo r=paulrouget
@bors-servo
Copy link
Contributor

bors-servo commented Dec 3, 2019

📌 Commit de90274 has been approved by paulrouget
@bors-servo
Copy link
Contributor

bors-servo commented Dec 3, 2019

⌛ Testing commit de90274 with merge 28c43b5...
bors-servo added a commit that referenced this pull request Dec 3, 2019
@bors-servo
Auto merge of #24927 - ferjm:hololens.mediasession, r=paulrouget
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
28c43b5 
Basic Media Session UI for Hololens

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #24807

This PR implements a extremely basic Media Session UI. The media controls are part of the main window, which is not very nice, but it is what we can do until #24873 is done.
@bors-servo
Copy link
Contributor

bors-servo commented Dec 3, 2019

💔 Test failed - status-taskcluster
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 3, 2019 

Build FAILED.
       "c:\users\task_1~4\appdata\local\temp\tmpxxolzj" (default target) (1) ->
       "C:\Users\task_1575353602\repo\support\hololens\ServoApp.sln" (Build target) (2) ->
       "C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj" (default target) (3) ->
       (ClCompile target) -> 
         c:\users\task_1575353602\repo\support\hololens\servoapp\servocontrol\servo.cpp(50): warning C4100: 'content': unreferenced formal parameter [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\servocontrol\servocontrol.cpp(151): warning C4100: 'e': unreferenced formal parameter [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\servocontrol\servocontrol.cpp(184): warning C4244: 'argument': conversion from 'const float' to 'GLsizei', possible loss of data [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\servocontrol\servocontrol.cpp(386): warning C4100: 'aShow': unreferenced formal parameter [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
       "c:\users\task_1~4\appdata\local\temp\tmpxxolzj" (default target) (1) ->
       "C:\Users\task_1575353602\repo\support\hololens\ServoApp.sln" (Build target) (2) ->
       "C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj" (default target) (3) ->
       (ClCompile target) -> 
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(160): error C2039: 'MediaSessionAction': is not a member of 'winrt::servo' [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(160): error C3083: 'MediaSessionAction': the symbol to the left of a '::' must be a type [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(160): error C2039: 'PLAY': is not a member of 'winrt::servo' [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(160): error C2065: 'PLAY': undeclared identifier [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(166): error C2039: 'MediaSessionAction': is not a member of 'winrt::servo' [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(166): error C3083: 'MediaSessionAction': the symbol to the left of a '::' must be a type [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(166): error C2039: 'PAUSE': is not a member of 'winrt::servo' [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
         c:\users\task_1575353602\repo\support\hololens\servoapp\browserpage.cpp(166): error C2065: 'PAUSE': undeclared identifier [C:\Users\task_1575353602\repo\support\hololens\ServoApp\ServoApp.vcxproj]
    4 Warning(s)
    8 Error(s)
@bors-servo
Copy link
Contributor

bors-servo commented Dec 3, 2019

☔ The latest upstream changes (presumably #24885) made this pull request unmergeable. Please resolve the merge conflicts.
@ferjm ferjm force-pushed the ferjm:hololens.mediasession branch from de90274 to 8e414d1 Dec 5, 2019
ferjm added 3 commits Nov 27, 2019
@ferjm
Hololens - MediaSession controls UI
c810962
@ferjm
Hololens - Show/hide media controls according to playback state
d633c8b
@ferjm
Hololens - Trigger MediaSessionActions for play and pause buttons
d5200ba
@ferjm
Introduce CMediaSessionPlaybackState and CMediaSessionActionType
b01e3fd
@ferjm ferjm force-pushed the ferjm:hololens.mediasession branch from 8e414d1 to ac67833 Dec 5, 2019
@ferjm
Fix libsimpleservo build after MediaSession C enums change
Loading status checks…
58623a6
@ferjm ferjm force-pushed the ferjm:hololens.mediasession branch from ac67833 to 58623a6 Dec 5, 2019
@ferjm
Copy link
Member Author

ferjm commented Dec 5, 2019

@bors-servo r=paulrouget
@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2019

📌 Commit 58623a6 has been approved by paulrouget
@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2019

⌛ Testing commit 58623a6 with merge c90dd15...
bors-servo added a commit that referenced this pull request Dec 5, 2019
@bors-servo
Auto merge of #24927 - ferjm:hololens.mediasession, r=paulrouget
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c90dd15 
Basic Media Session UI for Hololens

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #24807

This PR implements a extremely basic Media Session UI. The media controls are part of the main window, which is not very nice, but it is what we can do until #24873 is done.
@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2019

☀️ Test successful - status-taskcluster
Approved by: paulrouget
Pushing c90dd15 to master...
@bors-servo bors-servo merged commit 58623a6 into servo:master Dec 5, 2019
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@paulrouget paulrouget

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

[HoloLens] Implement Media Session UI
6 participants
@ferjm @paulrouget @bors-servo @CYBAI @nox @highfive
You can’t perform that action at this time.