ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2835 from degasus/master 

Wiimotes: Initialize all atomic<bool> globally.
This commit is contained in:
Markus Wick 2015-08-12 21:14:04 +02:00
parent 90e05f7bea 6b9eba5761
commit 40818c4aad
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HW/WiimoteReal/IONix.cpp
View File

@ -36,8 +36,7 @@ private:
}; };
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: m_want_wiimotes() : device_id(-1)
, device_id(-1)
, device_sock(-1) , device_sock(-1)
{ {
// Get the id of the first Bluetooth device. // Get the id of the first Bluetooth device.

2
Source/Core/Core/HW/WiimoteReal/IOWin.cpp
View File

@ -220,8 +220,6 @@ void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&); bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: m_run_thread()
, m_want_wiimotes()
{ {
init_lib(); init_lib();
} }

2
Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
View File

@ -71,8 +71,6 @@ private:
}; };
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: m_run_thread()
, m_want_wiimotes()
{} {}
WiimoteScanner::~WiimoteScanner() WiimoteScanner::~WiimoteScanner()

1
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -43,7 +43,6 @@ Wiimote::Wiimote()
, m_channel(0) , m_channel(0)
, m_last_connect_request_counter(0) , m_last_connect_request_counter(0)
, m_rumble_state() , m_rumble_state()
, m_need_prepare()
{} {}
void Wiimote::Shutdown() void Wiimote::Shutdown()

12
Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
View File

@ -99,11 +99,11 @@ private:
std::thread m_wiimote_thread; std::thread m_wiimote_thread;
// Whether to keep running the thread. // Whether to keep running the thread.
std::atomic<bool> m_run_thread; std::atomic<bool> m_run_thread {false};
// Whether to call PrepareOnThread. // Whether to call PrepareOnThread.
std::atomic<bool> m_need_prepare; std::atomic<bool> m_need_prepare {false};
// Whether the thread has finished ConnectInternal. // Whether the thread has finished ConnectInternal.
std::atomic<bool> m_thread_ready; std::atomic<bool> m_thread_ready {false};
std::mutex m_thread_ready_mutex; std::mutex m_thread_ready_mutex;
std::condition_variable m_thread_ready_cond; std::condition_variable m_thread_ready_cond;
@ -137,9 +137,9 @@ private:
std::thread m_scan_thread; std::thread m_scan_thread;
std::atomic<bool> m_run_thread; std::atomic<bool> m_run_thread {false};
std::atomic<bool> m_want_wiimotes; std::atomic<bool> m_want_wiimotes {false};
std::atomic<bool> m_want_bb; std::atomic<bool> m_want_bb {false};
#if defined(_WIN32) #if defined(_WIN32)
void CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb); void CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb);