Skip to content

Commit 4bb842f

Browse files
TylerJaacksTylerJaacks
committed
Fix the Title and Subtitle idl statements.
1 parent b79e0e6 commit 4bb842f

File tree

3 files changed

+143
-127
lines changed

3 files changed

+143
-127
lines changed

‎dlls/winrt_x/External/Windows.Xbox.Media.GameTransportControls.idl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ namespace Windows
100100
interface IGameTransportControls : IInspectable
101101
{
102102
[propget] HRESULT Title([out][retval] HSTRING* value);
103+
[propput] HRESULT Title([in] HSTRING value);
103104
[propget] HRESULT Subtitle([out][retval] HSTRING* value);
105+
[propput] HRESULT Subtitle([in] HSTRING value);
104106
[propget] HRESULT PlaybackStatus([out][retval] Windows.Xbox.Media.GamePlaybackStatus* value);
105107
[propput] HRESULT PlaybackStatus([in] Windows.Xbox.Media.GamePlaybackStatus value);
106108
[propget] HRESULT SoundLevel([out][retval] Windows.Xbox.Media.SoundLevel* value);

‎dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp‎

Lines changed: 101 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -4,100 +4,112 @@
44

55
namespace winrt::Windows::Xbox::Media::implementation
66
{
7-
hstring GameTransportControls::Title()
8-
{
9-
LOG_NOT_IMPLEMENTED(); return L"null";
10-
}
11-
hstring GameTransportControls::Subtitle()
12-
{
13-
LOG_NOT_IMPLEMENTED(); return L"null";
14-
}
15-
winrt::Windows::Xbox::Media::GamePlaybackStatus GameTransportControls::PlaybackStatus()
16-
{
17-
return m_gamePlaybackStatus;
18-
}
19-
void GameTransportControls::PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value)
20-
{
21-
m_gamePlaybackStatus = value;
22-
}
23-
winrt::Windows::Xbox::Media::SoundLevel GameTransportControls::SoundLevel()
24-
{
25-
return SoundLevel::Muted;
26-
}
27-
bool GameTransportControls::IsEnabled()
28-
{
29-
return m_enabled;
30-
}
31-
void GameTransportControls::IsEnabled(bool value)
32-
{
33-
m_enabled = value;
34-
}
7+
hstring GameTransportControls::Title()
8+
{
9+
LOG_NOT_IMPLEMENTED(); return L"null";
10+
}
3511

36-
bool GameTransportControls::IsPlayEnabled()
37-
{
38-
return m_playEnabled;
39-
}
40-
void GameTransportControls::IsPlayEnabled(bool value)
41-
{
42-
m_playEnabled = value;
43-
}
12+
void GameTransportControls::Title(hstring value)
13+
{
14+
LOG_NOT_IMPLEMENTED();
15+
}
4416

45-
bool GameTransportControls::IsPauseEnabled()
46-
{
47-
return m_pauseEnabled;
48-
}
49-
void GameTransportControls::IsPauseEnabled(bool value)
50-
{
51-
m_pauseEnabled = value;
52-
}
17+
hstring GameTransportControls::Subtitle()
18+
{
19+
LOG_NOT_IMPLEMENTED(); return L"null";
20+
}
5321

54-
bool GameTransportControls::IsMenuEnabled()
55-
{
56-
return m_menuEnabled;
57-
}
58-
void GameTransportControls::IsMenuEnabled(bool value)
59-
{
60-
m_menuEnabled = value;
61-
}
22+
void GameTransportControls::Subtitle(hstring value)
23+
{
24+
LOG_NOT_IMPLEMENTED();
25+
}
6226

63-
bool GameTransportControls::IsViewEnabled()
64-
{
65-
return m_viewEnabled;
66-
}
67-
void GameTransportControls::IsViewEnabled(bool value)
68-
{
69-
m_viewEnabled = value;
70-
}
27+
winrt::Windows::Xbox::Media::GamePlaybackStatus GameTransportControls::PlaybackStatus()
28+
{
29+
return m_gamePlaybackStatus;
30+
}
31+
void GameTransportControls::PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value)
32+
{
33+
m_gamePlaybackStatus = value;
34+
}
35+
winrt::Windows::Xbox::Media::SoundLevel GameTransportControls::SoundLevel()
36+
{
37+
return SoundLevel::Muted;
38+
}
39+
bool GameTransportControls::IsEnabled()
40+
{
41+
return m_enabled;
42+
}
43+
void GameTransportControls::IsEnabled(bool value)
44+
{
45+
m_enabled = value;
46+
}
7147

72-
bool GameTransportControls::IsBackEnabled()
73-
{
74-
return m_backEnabled;
75-
}
76-
void GameTransportControls::IsBackEnabled(bool value)
77-
{
78-
m_backEnabled = value;
79-
}
80-
winrt::event_token GameTransportControls::ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler)
81-
{
82-
return m_gameTransportControlsButtonPressedEventArgs.add(handler);
83-
}
84-
void GameTransportControls::ButtonPressed(winrt::event_token const& token) noexcept
85-
{
86-
m_gameTransportControlsButtonPressedEventArgs.remove(token);
87-
}
88-
winrt::event_token GameTransportControls::PropertyChanged(
89-
winrt::Windows::Foundation::TypedEventHandler<
90-
winrt::Windows::Xbox::Media::GameTransportControls,
91-
winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler)
92-
{
93-
// Optional debug logging
94-
wprintf(L"[GameTransportControls] PropertyChanged handler added\n");
48+
bool GameTransportControls::IsPlayEnabled()
49+
{
50+
return m_playEnabled;
51+
}
52+
void GameTransportControls::IsPlayEnabled(bool value)
53+
{
54+
m_playEnabled = value;
55+
}
9556

96-
return m_gameTransportControlsPropertyChangedEventArgs.add(handler);
97-
}
57+
bool GameTransportControls::IsPauseEnabled()
58+
{
59+
return m_pauseEnabled;
60+
}
61+
void GameTransportControls::IsPauseEnabled(bool value)
62+
{
63+
m_pauseEnabled = value;
64+
}
9865

99-
void GameTransportControls::PropertyChanged(winrt::event_token const& token) noexcept
100-
{
101-
m_gameTransportControlsPropertyChangedEventArgs.remove(token);
102-
}
66+
bool GameTransportControls::IsMenuEnabled()
67+
{
68+
return m_menuEnabled;
69+
}
70+
void GameTransportControls::IsMenuEnabled(bool value)
71+
{
72+
m_menuEnabled = value;
73+
}
74+
75+
bool GameTransportControls::IsViewEnabled()
76+
{
77+
return m_viewEnabled;
78+
}
79+
void GameTransportControls::IsViewEnabled(bool value)
80+
{
81+
m_viewEnabled = value;
82+
}
83+
84+
bool GameTransportControls::IsBackEnabled()
85+
{
86+
return m_backEnabled;
87+
}
88+
void GameTransportControls::IsBackEnabled(bool value)
89+
{
90+
m_backEnabled = value;
91+
}
92+
winrt::event_token GameTransportControls::ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler)
93+
{
94+
return m_gameTransportControlsButtonPressedEventArgs.add(handler);
95+
}
96+
void GameTransportControls::ButtonPressed(winrt::event_token const& token) noexcept
97+
{
98+
m_gameTransportControlsButtonPressedEventArgs.remove(token);
99+
}
100+
winrt::event_token GameTransportControls::PropertyChanged(
101+
winrt::Windows::Foundation::TypedEventHandler<
102+
winrt::Windows::Xbox::Media::GameTransportControls,
103+
winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler)
104+
{
105+
// Optional debug logging
106+
wprintf(L"[GameTransportControls] PropertyChanged handler added\n");
107+
108+
return m_gameTransportControlsPropertyChangedEventArgs.add(handler);
109+
}
110+
111+
void GameTransportControls::PropertyChanged(winrt::event_token const& token) noexcept
112+
{
113+
m_gameTransportControlsPropertyChangedEventArgs.remove(token);
114+
}
103115
}

‎dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.h‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,50 @@
33

44
namespace winrt::Windows::Xbox::Media::implementation
55
{
6-
struct GameTransportControls : GameTransportControlsT<GameTransportControls>
7-
{
8-
GameTransportControls() = default;
6+
struct GameTransportControls : GameTransportControlsT<GameTransportControls>
7+
{
8+
GameTransportControls() = default;
99

10-
hstring Title();
11-
hstring Subtitle();
12-
winrt::Windows::Xbox::Media::GamePlaybackStatus PlaybackStatus();
13-
void PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value);
14-
winrt::Windows::Xbox::Media::SoundLevel SoundLevel();
15-
bool IsEnabled();
16-
void IsEnabled(bool value);
17-
bool IsPlayEnabled();
18-
void IsPlayEnabled(bool value);
19-
bool IsPauseEnabled();
10+
hstring Title();
11+
void Title(hstring value);
12+
hstring Subtitle();
13+
void Subtitle(hstring value);
14+
winrt::Windows::Xbox::Media::GamePlaybackStatus PlaybackStatus();
15+
void PlaybackStatus(winrt::Windows::Xbox::Media::GamePlaybackStatus const& value);
16+
winrt::Windows::Xbox::Media::SoundLevel SoundLevel();
17+
bool IsEnabled();
18+
void IsEnabled(bool value);
19+
bool IsPlayEnabled();
20+
void IsPlayEnabled(bool value);
21+
bool IsPauseEnabled();
2022

21-
void IsPauseEnabled(bool value);
22-
bool IsMenuEnabled();
23-
void IsMenuEnabled(bool value);
24-
bool IsViewEnabled();
25-
void IsViewEnabled(bool value);
26-
bool IsBackEnabled();
27-
void IsBackEnabled(bool value);
28-
winrt::event_token ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler);
29-
void ButtonPressed(winrt::event_token const& token) noexcept;
30-
winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler);
31-
void PropertyChanged(winrt::event_token const& token) noexcept;
23+
void IsPauseEnabled(bool value);
24+
bool IsMenuEnabled();
25+
void IsMenuEnabled(bool value);
26+
bool IsViewEnabled();
27+
void IsViewEnabled(bool value);
28+
bool IsBackEnabled();
29+
void IsBackEnabled(bool value);
30+
winrt::event_token ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs> const& handler);
31+
void ButtonPressed(winrt::event_token const& token) noexcept;
32+
winrt::event_token PropertyChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs> const& handler);
33+
void PropertyChanged(winrt::event_token const& token) noexcept;
3234

33-
private:
34-
GamePlaybackStatus m_gamePlaybackStatus = GamePlaybackStatus::Closed;
35-
bool m_enabled = false;
36-
bool m_playEnabled = false;
37-
bool m_pauseEnabled = false;
38-
bool m_menuEnabled = false;
39-
bool m_viewEnabled = false;
40-
bool m_backEnabled = false;
41-
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs>> m_gameTransportControlsButtonPressedEventArgs;
42-
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs>> m_gameTransportControlsPropertyChangedEventArgs;
43-
};
35+
private:
36+
GamePlaybackStatus m_gamePlaybackStatus = GamePlaybackStatus::Closed;
37+
bool m_enabled = false;
38+
bool m_playEnabled = false;
39+
bool m_pauseEnabled = false;
40+
bool m_menuEnabled = false;
41+
bool m_viewEnabled = false;
42+
bool m_backEnabled = false;
43+
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsButtonPressedEventArgs>> m_gameTransportControlsButtonPressedEventArgs;
44+
winrt::event<winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::GameTransportControls, winrt::Windows::Xbox::Media::GameTransportControlsPropertyChangedEventArgs>> m_gameTransportControlsPropertyChangedEventArgs;
45+
};
4446
}
4547
namespace winrt::Windows::Xbox::Media::factory_implementation
4648
{
47-
struct GameTransportControls : GameTransportControlsT<GameTransportControls, implementation::GameTransportControls>
48-
{
49-
};
49+
struct GameTransportControls : GameTransportControlsT<GameTransportControls, implementation::GameTransportControls>
50+
{
51+
};
5052
}

0 commit comments

Comments
 (0)