From 4bb842f498b21766f56fab86262874674af0dbda Mon Sep 17 00:00:00 2001 From: Tyler Jaacks Date: Mon, 25 Aug 2025 15:40:32 -0500 Subject: [PATCH] Fix the Title and Subtitle idl statements. --- ...ndows.Xbox.Media.GameTransportControls.idl | 2 + ...ndows.Xbox.Media.GameTransportControls.cpp | 190 ++++++++++-------- ...Windows.Xbox.Media.GameTransportControls.h | 78 +++---- 3 files changed, 143 insertions(+), 127 deletions(-) diff --git a/dlls/winrt_x/External/Windows.Xbox.Media.GameTransportControls.idl b/dlls/winrt_x/External/Windows.Xbox.Media.GameTransportControls.idl index 8cad84a..289d386 100644 --- a/dlls/winrt_x/External/Windows.Xbox.Media.GameTransportControls.idl +++ b/dlls/winrt_x/External/Windows.Xbox.Media.GameTransportControls.idl @@ -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); diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp index 2fc7574..5300db1 100644 --- a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp +++ b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp @@ -4,100 +4,112 @@ 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 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 - wprintf(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 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 + wprintf(L"[GameTransportControls] PropertyChanged handler added\n"); + + return m_gameTransportControlsPropertyChangedEventArgs.add(handler); + } + + void GameTransportControls::PropertyChanged(winrt::event_token const& token) noexcept + { + m_gameTransportControlsPropertyChangedEventArgs.remove(token); + } } diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.h b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.h index 1fa7686..e2e4978 100644 --- a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.h +++ b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.h @@ -3,48 +3,50 @@ namespace winrt::Windows::Xbox::Media::implementation { - struct GameTransportControls : GameTransportControlsT - { - GameTransportControls() = default; + struct GameTransportControls : GameTransportControlsT + { + 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 const& handler); - void ButtonPressed(winrt::event_token const& token) noexcept; - winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler 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 const& handler); + void ButtonPressed(winrt::event_token const& token) noexcept; + winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler 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> m_gameTransportControlsButtonPressedEventArgs; - winrt::event> 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> m_gameTransportControlsButtonPressedEventArgs; + winrt::event> m_gameTransportControlsPropertyChangedEventArgs; + }; } namespace winrt::Windows::Xbox::Media::factory_implementation { - struct GameTransportControls : GameTransportControlsT - { - }; + struct GameTransportControls : GameTransportControlsT + { + }; }