Merge branch 'main' into main

This commit is contained in:
Tyler Jaacks
2025-09-04 00:53:52 -05:00
committed by GitHub
3 changed files with 143 additions and 128 deletions

View File

@@ -100,7 +100,9 @@ namespace Windows
interface IGameTransportControls : IInspectable
{
[propget] HRESULT Title([out][retval] HSTRING* value);
[propput] HRESULT Title([in] HSTRING value);
[propget] HRESULT Subtitle([out][retval] HSTRING* value);
[propput] HRESULT Subtitle([in] HSTRING value);
[propget] HRESULT PlaybackStatus([out][retval] Windows.Xbox.Media.GamePlaybackStatus* value);
[propput] HRESULT PlaybackStatus([in] Windows.Xbox.Media.GamePlaybackStatus value);
[propget] HRESULT SoundLevel([out][retval] Windows.Xbox.Media.SoundLevel* value);

View File

@@ -4,100 +4,111 @@
namespace winrt::Windows::Xbox::Media::implementation
{
hstring GameTransportControls::Title()
{
LOG_NOT_IMPLEMENTED(); return L"null";
}
hstring GameTransportControls::Subtitle()
{
LOG_NOT_IMPLEMENTED(); return L"null";
}
winrt::Windows::Xbox::Media::GamePlaybackStatus GameTransportControls::PlaybackStatus()
{
return m_gamePlaybackStatus;
}
void GameTransportControls::PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value)
{
m_gamePlaybackStatus = value;
}
winrt::Windows::Xbox::Media::SoundLevel GameTransportControls::SoundLevel()
{
return SoundLevel::Muted;
}
bool GameTransportControls::IsEnabled()
{
return m_enabled;
}
void GameTransportControls::IsEnabled(bool value)
{
m_enabled = value;
}
hstring GameTransportControls::Title()
{
LOG_NOT_IMPLEMENTED(); return L"null";
}
bool GameTransportControls::IsPlayEnabled()
{
return m_playEnabled;
}
void GameTransportControls::IsPlayEnabled(bool value)
{
m_playEnabled = value;
}
void GameTransportControls::Title(hstring value)
{
LOG_NOT_IMPLEMENTED();
}
bool GameTransportControls::IsPauseEnabled()
{
return m_pauseEnabled;
}
void GameTransportControls::IsPauseEnabled(bool value)
{
m_pauseEnabled = value;
}
hstring GameTransportControls::Subtitle()
{
LOG_NOT_IMPLEMENTED(); return L"null";
}
bool GameTransportControls::IsMenuEnabled()
{
return m_menuEnabled;
}
void GameTransportControls::IsMenuEnabled(bool value)
{
m_menuEnabled = value;
}
void GameTransportControls::Subtitle(hstring value)
{
LOG_NOT_IMPLEMENTED();
}
bool GameTransportControls::IsViewEnabled()
{
return m_viewEnabled;
}
void GameTransportControls::IsViewEnabled(bool value)
{
m_viewEnabled = value;
}
winrt::Windows::Xbox::Media::GamePlaybackStatus GameTransportControls::PlaybackStatus()
{
return m_gamePlaybackStatus;
}
void GameTransportControls::PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value)
{
m_gamePlaybackStatus = value;
}
winrt::Windows::Xbox::Media::SoundLevel GameTransportControls::SoundLevel()
{
return SoundLevel::Muted;
}
bool GameTransportControls::IsEnabled()
{
return m_enabled;
}
void GameTransportControls::IsEnabled(bool value)
{
m_enabled = value;
}
bool GameTransportControls::IsBackEnabled()
{
return m_backEnabled;
}
void GameTransportControls::IsBackEnabled(bool value)
{
m_backEnabled = value;
}
winrt::event_token GameTransportControls::ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler)
{
return m_gameTransportControlsButtonPressedEventArgs.add(handler);
}
void GameTransportControls::ButtonPressed(winrt::event_token const& token) noexcept
{
m_gameTransportControlsButtonPressedEventArgs.remove(token);
}
winrt::event_token GameTransportControls::PropertyChanged(
winrt::Windows::Foundation::TypedEventHandler<
winrt::Windows::Xbox::Media::GameTransportControls,
winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler)
{
// Optional debug logging
LOG_INFO_W(L"[GameTransportControls] PropertyChanged handler added\n");
bool GameTransportControls::IsPlayEnabled()
{
return m_playEnabled;
}
void GameTransportControls::IsPlayEnabled(bool value)
{
m_playEnabled = value;
}
return m_gameTransportControlsPropertyChangedEventArgs.add(handler);
}
bool GameTransportControls::IsPauseEnabled()
{
return m_pauseEnabled;
}
void GameTransportControls::IsPauseEnabled(bool value)
{
m_pauseEnabled = value;
}
void GameTransportControls::PropertyChanged(winrt::event_token const& token) noexcept
{
m_gameTransportControlsPropertyChangedEventArgs.remove(token);
}
}
bool GameTransportControls::IsMenuEnabled()
{
return m_menuEnabled;
}
void GameTransportControls::IsMenuEnabled(bool value)
{
m_menuEnabled = value;
}
bool GameTransportControls::IsViewEnabled()
{
return m_viewEnabled;
}
void GameTransportControls::IsViewEnabled(bool value)
{
m_viewEnabled = value;
}
bool GameTransportControls::IsBackEnabled()
{
return m_backEnabled;
}
void GameTransportControls::IsBackEnabled(bool value)
{
m_backEnabled = value;
}
winrt::event_token GameTransportControls::ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler)
{
return m_gameTransportControlsButtonPressedEventArgs.add(handler);
}
void GameTransportControls::ButtonPressed(winrt::event_token const& token) noexcept
{
m_gameTransportControlsButtonPressedEventArgs.remove(token);
}
winrt::event_token GameTransportControls::PropertyChanged(
winrt::Windows::Foundation::TypedEventHandler<
winrt::Windows::Xbox::Media::GameTransportControls,
winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler)
{
LOG_INFO_W(L"[GameTransportControls] PropertyChanged handler added\n");
return m_gameTransportControlsPropertyChangedEventArgs.add(handler);
}
void GameTransportControls::PropertyChanged(winrt::event_token const& token) noexcept
{
m_gameTransportControlsPropertyChangedEventArgs.remove(token);
}
}

View File

@@ -3,48 +3,50 @@
namespace winrt::Windows::Xbox::Media::implementation
{
struct GameTransportControls : GameTransportControlsT<GameTransportControls>
{
GameTransportControls() = default;
struct GameTransportControls : GameTransportControlsT<GameTransportControls>
{
GameTransportControls() = default;
hstring Title();
hstring Subtitle();
winrt::Windows::Xbox::Media::GamePlaybackStatus PlaybackStatus();
void PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value);
winrt::Windows::Xbox::Media::SoundLevel SoundLevel();
bool IsEnabled();
void IsEnabled(bool value);
bool IsPlayEnabled();
void IsPlayEnabled(bool value);
bool IsPauseEnabled();
hstring Title();
void Title(hstring value);
hstring Subtitle();
void Subtitle(hstring value);
winrt::Windows::Xbox::Media::GamePlaybackStatus PlaybackStatus();
void PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value);
winrt::Windows::Xbox::Media::SoundLevel SoundLevel();
bool IsEnabled();
void IsEnabled(bool value);
bool IsPlayEnabled();
void IsPlayEnabled(bool value);
bool IsPauseEnabled();
void IsPauseEnabled(bool value);
bool IsMenuEnabled();
void IsMenuEnabled(bool value);
bool IsViewEnabled();
void IsViewEnabled(bool value);
bool IsBackEnabled();
void IsBackEnabled(bool value);
winrt::event_token ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler);
void ButtonPressed(winrt::event_token const& token) noexcept;
winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler);
void PropertyChanged(winrt::event_token const& token) noexcept;
void IsPauseEnabled(bool value);
bool IsMenuEnabled();
void IsMenuEnabled(bool value);
bool IsViewEnabled();
void IsViewEnabled(bool value);
bool IsBackEnabled();
void IsBackEnabled(bool value);
winrt::event_token ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler);
void ButtonPressed(winrt::event_token const& token) noexcept;
winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler);
void PropertyChanged(winrt::event_token const& token) noexcept;
private:
GamePlaybackStatus m_gamePlaybackStatus = GamePlaybackStatus::Closed;
bool m_enabled = false;
bool m_playEnabled = false;
bool m_pauseEnabled = false;
bool m_menuEnabled = false;
bool m_viewEnabled = false;
bool m_backEnabled = false;
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs>> m_gameTransportControlsButtonPressedEventArgs;
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs>> m_gameTransportControlsPropertyChangedEventArgs;
};
private:
GamePlaybackStatus m_gamePlaybackStatus = GamePlaybackStatus::Closed;
bool m_enabled = false;
bool m_playEnabled = false;
bool m_pauseEnabled = false;
bool m_menuEnabled = false;
bool m_viewEnabled = false;
bool m_backEnabled = false;
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs>> m_gameTransportControlsButtonPressedEventArgs;
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs>> m_gameTransportControlsPropertyChangedEventArgs;
};
}
namespace winrt::Windows::Xbox::Media::factory_implementation
{
struct GameTransportControls : GameTransportControlsT<GameTransportControls, implementation::GameTransportControls>
{
};
struct GameTransportControls : GameTransportControlsT<GameTransportControls, implementation::GameTransportControls>
{
};
}