Skip to content

Commit 3c0ddd8

Browse files
committed
Fix build.
1 parent 363cf86 commit 3c0ddd8

File tree

3 files changed

+67
-32
lines changed

3 files changed

+67
-32
lines changed

SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,6 @@ namespace PokemonAutomation{
2626

2727

2828

29-
SystemSleepController::SystemSleepController()
30-
: m_data(new InternalController())
31-
{}
32-
SystemSleepController::~SystemSleepController(){
33-
std::lock_guard<std::mutex> lg(m_data->lock);
34-
m_data->screen_on_requests = 0;
35-
m_data->no_sleep_requests = 0;
36-
m_data->update_state();
37-
}
38-
void SystemSleepController::push_screen_on(){
39-
std::lock_guard<std::mutex> lg(m_data->lock);
40-
m_data->screen_on_requests++;
41-
m_data->update_state();
42-
}
43-
void SystemSleepController::pop_screen_on(){
44-
std::lock_guard<std::mutex> lg(m_data->lock);
45-
m_data->screen_on_requests--;
46-
m_data->update_state();
47-
}
48-
void SystemSleepController::push_no_sleep(){
49-
std::lock_guard<std::mutex> lg(m_data->lock);
50-
m_data->no_sleep_requests++;
51-
m_data->update_state();
52-
}
53-
void SystemSleepController::pop_no_sleep(){
54-
std::lock_guard<std::mutex> lg(m_data->lock);
55-
m_data->no_sleep_requests--;
56-
m_data->update_state();
57-
}
5829

5930

6031

SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Apple.tpp

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ namespace PokemonAutomation{
1414

1515

1616

17-
class SystemSleepController::InternalController{
18-
public:
17+
struct SystemSleepController::InternalController{
18+
//public:
1919
InternalController();
2020
~InternalController();
2121

@@ -25,7 +25,7 @@ public:
2525

2626
void update_state();
2727

28-
private:
28+
//private:
2929
bool disable_sleep();
3030
bool enable_sleep();
3131

@@ -103,5 +103,38 @@ void SystemSleepController::InternalController::update_state(){
103103

104104

105105

106+
SystemSleepController::SystemSleepController()
107+
: m_data(new InternalController())
108+
{}
109+
SystemSleepController::~SystemSleepController(){
110+
std::lock_guard<std::mutex> lg(m_data->lock);
111+
m_data->screen_on_requests = 0;
112+
m_data->no_sleep_requests = 0;
113+
m_data->update_state();
114+
}
115+
void SystemSleepController::push_screen_on(){
116+
std::lock_guard<std::mutex> lg(m_data->lock);
117+
m_data->screen_on_requests++;
118+
m_data->update_state();
119+
}
120+
void SystemSleepController::pop_screen_on(){
121+
std::lock_guard<std::mutex> lg(m_data->lock);
122+
m_data->screen_on_requests--;
123+
m_data->update_state();
124+
}
125+
void SystemSleepController::push_no_sleep(){
126+
std::lock_guard<std::mutex> lg(m_data->lock);
127+
m_data->no_sleep_requests++;
128+
m_data->update_state();
129+
}
130+
void SystemSleepController::pop_no_sleep(){
131+
std::lock_guard<std::mutex> lg(m_data->lock);
132+
m_data->no_sleep_requests--;
133+
m_data->update_state();
134+
}
135+
136+
137+
138+
106139

107140
}

SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Windows.tpp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,37 @@ struct SystemSleepController::InternalController{
4848

4949

5050

51+
SystemSleepController::SystemSleepController()
52+
: m_data(new InternalController())
53+
{}
54+
SystemSleepController::~SystemSleepController(){
55+
std::lock_guard<std::mutex> lg(m_data->lock);
56+
m_data->screen_on_requests = 0;
57+
m_data->no_sleep_requests = 0;
58+
m_data->update_state();
59+
}
60+
void SystemSleepController::push_screen_on(){
61+
std::lock_guard<std::mutex> lg(m_data->lock);
62+
m_data->screen_on_requests++;
63+
m_data->update_state();
64+
}
65+
void SystemSleepController::pop_screen_on(){
66+
std::lock_guard<std::mutex> lg(m_data->lock);
67+
m_data->screen_on_requests--;
68+
m_data->update_state();
69+
}
70+
void SystemSleepController::push_no_sleep(){
71+
std::lock_guard<std::mutex> lg(m_data->lock);
72+
m_data->no_sleep_requests++;
73+
m_data->update_state();
74+
}
75+
void SystemSleepController::pop_no_sleep(){
76+
std::lock_guard<std::mutex> lg(m_data->lock);
77+
m_data->no_sleep_requests--;
78+
m_data->update_state();
79+
}
80+
81+
5182

5283

5384

0 commit comments

Comments
 (0)