Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Hololens - Trigger MediaSessionActions for play and pause buttons

Browse source
This commit is contained in:
Fernando Jimenez Moreno 2019-11-29 12:44:26 +01:00
parent d633c8b9da
commit d5200ba453
11 changed files with 69 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ports/libsimpleservo/capi/src/lib.rs
View file

@ -607,6 +607,14 @@ pub extern "C" fn click(x: f32, y: f32) {
});
}
#[no_mangle]
pub extern "C" fn media_session_action(action: i32) {
catch_any_panic(|| {
debug!("media_session_action");
call(|s| s.media_session_action(action));
});
}
pub struct WakeupCallback(extern "C" fn());
impl WakeupCallback {

37
support/hololens/ServoApp/BrowserPage.cpp
View file

@ -7,6 +7,7 @@
#include "BrowserPage.h"
#include "BrowserPage.g.cpp"
#include "DefaultUrl.h"
#include "MediaSession.h"
using namespace std::placeholders;
using namespace winrt::Windows::Foundation;
@ -72,18 +73,20 @@ void BrowserPage::BindServoEvents() {
urlTextbox().GotFocus(std::bind(&BrowserPage::OnURLFocused, this, _1));
servoControl().OnMediaSessionMetadata(
[=](hstring title, hstring artist, hstring album) {});
servoControl().OnMediaSessionPlaybackStateChange([=](const auto &,
int state) {
if (state == 1 /* none */) {
mediaControls().Visibility(Visibility::Collapsed);
return;
}
mediaControls().Visibility(Visibility::Visible);
playButton().Visibility(state == 3 /* paused */ ? Visibility::Visible
: Visibility::Collapsed);
pauseButton().Visibility(state == 3 /* paused */ ? Visibility::Collapsed
: Visibility::Visible);
});
servoControl().OnMediaSessionPlaybackStateChange(
[=](const auto &, int state) {
if (state == servo::PlaybackState::NONE) {
mediaControls().Visibility(Visibility::Collapsed);
return;
}
mediaControls().Visibility(Visibility::Visible);
playButton().Visibility(state == servo::PlaybackState::PAUSED
? Visibility::Visible
: Visibility::Collapsed);
pauseButton().Visibility(state == servo::PlaybackState::PAUSED
? Visibility::Collapsed
: Visibility::Visible);
});
}
void BrowserPage::OnURLFocused(Windows::Foundation::IInspectable const &) {
@ -159,9 +162,15 @@ void BrowserPage::OnURLEdited(IInspectable const &,
void BrowserPage::OnMediaControlsPlayClicked(
Windows::Foundation::IInspectable const &,
Windows::UI::Xaml::RoutedEventArgs const &) {}
Windows::UI::Xaml::RoutedEventArgs const &) {
servoControl().SendMediaSessionAction(
static_cast<int32_t>(servo::MediaSessionAction::PLAY));
}
void BrowserPage::OnMediaControlsPauseClicked(
Windows::Foundation::IInspectable const &,
Windows::UI::Xaml::RoutedEventArgs const &) {}
Windows::UI::Xaml::RoutedEventArgs const &) {
servoControl().SendMediaSessionAction(
static_cast<int32_t>(servo::MediaSessionAction::PAUSE));
}
} // namespace winrt::ServoApp::implementation

4
support/hololens/ServoApp/BrowserPage.xaml
View file

@ -140,10 +140,6 @@
<CommandBar Grid.Row="3" x:Name="mediaControls" Visibility="Collapsed">
<AppBarButton Icon="Play" Label="Play" x:Name="playButton" Visibility="Collapsed" Click="OnMediaControlsPlayClicked"/>
<AppBarButton Icon="Pause" Label="Pause" x:Name="pauseButton" Click="OnMediaControlsPauseClicked"/>
<CommandBar.Content>
<TextBlock Text="Now playing..." Margin="12,14"/>
</CommandBar.Content>
</CommandBar>
</Grid>

21
support/hololens/ServoApp/MediaSession.h Normal file
View file

@ -0,0 +1,21 @@
#pragma once
namespace winrt::servo {
enum PlaybackState {
NONE = 1,
PLAYING,
PAUSED
};
enum MediaSessionAction {
PLAY = 1,
PAUSE,
SEEK_BACKWARD,
SEEK_FORWARD,
PREVIOUS_TRACK,
NEXT_TRACK,
SKIP_AD,
STOP,
SEEK_TO
};
}

1
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -122,6 +122,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="logs.h" />
<ClInclude Include="MediaSession.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="App.h">
<DependentUpon>App.xaml</DependentUpon>

3
support/hololens/ServoApp/ServoApp.vcxproj.filters
View file

@ -40,6 +40,9 @@
</ClInclude>
<ClInclude Include="DefaultUrl.h" />
<ClInclude Include="XRPkgChecker.h" />
<ClInclude Include="MediaSession.h">
<Filter>ServoControl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Wide310x150Logo.scale-200.png">

3
support/hololens/ServoApp/ServoControl/Servo.cpp
View file

@ -73,8 +73,7 @@ Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height,
capi::CInitOptions o;
hstring defaultPrefs = L" --pref dom.webxr.enabled";
o.args = *hstring2char(args + defaultPrefs);
o.url =
"https://ferjm.github.io/web-api-tests/video/mp4.html"; //*hstring2char(url);
o.url = *hstring2char(url);
o.width = mWindowWidth;
o.height = mWindowHeight;
o.density = dpi;

3
support/hololens/ServoApp/ServoControl/Servo.h
View file

@ -88,6 +88,9 @@ public:
capi::resize(mWindowWidth, mWindowHeight);
}
}
void SendMediaSessionAction(int32_t action) {
capi::media_session_action(action);
}
private:
ServoDelegate &mDelegate;

4
support/hololens/ServoApp/ServoControl/ServoControl.cpp
View file

@ -271,6 +271,10 @@ hstring ServoControl::LoadURIOrSearch(hstring input) {
return searchUri;
}
void ServoControl::SendMediaSessionAction(int32_t action) {
RunOnGLThread([=] { mServo->SendMediaSessionAction(action); });
}
void ServoControl::TryLoadUri(hstring input) {
if (!mLooping) {
mInitialURL = input;

2
support/hololens/ServoApp/ServoControl/ServoControl.h
View file

@ -3,6 +3,7 @@
#include "OpenGLES.h"
#include "Servo.h"
#include "DefaultUrl.h"
#include "MediaSession.h"
namespace winrt::ServoApp::implementation {
struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
@ -15,6 +16,7 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
void Stop();
void Shutdown();
hstring LoadURIOrSearch(hstring);
void SendMediaSessionAction(int32_t);
void OnLoaded(IInspectable const &,
Windows::UI::Xaml::RoutedEventArgs const &);

5
support/hololens/ServoApp/ServoControl/ServoControl.idl
View file

@ -14,6 +14,7 @@ namespace ServoApp {
void SetTransientMode(Boolean transient);
void SetArgs(String args);
void Shutdown();
void SendMediaSessionAction(UInt32 action);
event EventDelegate OnLoadStarted;
event EventDelegate OnLoadEnded;
event EventDelegate OnCaptureGesturesStarted;
@ -21,7 +22,7 @@ namespace ServoApp {
event HistoryChangedDelegate OnHistoryChanged;
event Windows.Foundation.EventHandler<String> OnTitleChanged;
event Windows.Foundation.EventHandler<String> OnURLChanged;
event MediaSessionMetadataDelegate OnMediaSessionMetadata;
event Windows.Foundation.EventHandler<int> OnMediaSessionPlaybackStateChange;
event MediaSessionMetadataDelegate OnMediaSessionMetadata;
event Windows.Foundation.EventHandler<int> OnMediaSessionPlaybackStateChange;
}
} // namespace ServoApp