piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4000 from JosJuice/movie-netplay-global

Browse Source 
Movie: Don't access g_netplay_initial_gctime directly
This commit is contained in:
Pierre Bourdon 2016-07-11 17:09:04 +02:00 committed by GitHub
commit 2de6d07360
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Movie.cpp
View File

@ -22,7 +22,7 @@
#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPCore.h"
#include "Core/HW/CPU.h" #include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h" #include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h" #include "Core/HW/SI.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
@ -31,7 +31,6 @@
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayClient.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "Core/State.h" #include "Core/State.h"
@ -516,7 +515,7 @@ bool BeginRecordingInput(int controllers)
if (NetPlay::IsNetPlayRunning()) if (NetPlay::IsNetPlayRunning())
{ {
s_bNetPlay = true; s_bNetPlay = true;
s_recordingStartTime = g_netplay_initial_gctime; s_recordingStartTime = CEXIIPL::NetPlay_GetGCTime();
} }
else else
{ {

2
Source/Core/Core/NetPlayClient.cpp
View File

@ -1223,6 +1223,8 @@ bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size)
// called from ---CPU--- thread // called from ---CPU--- thread
// so all players' games get the same time // so all players' games get the same time
//
// also called from ---GUI--- thread when starting input recording
u64 CEXIIPL::NetPlay_GetGCTime() u64 CEXIIPL::NetPlay_GetGCTime()
{ {
std::lock_guard<std::mutex> lk(crit_netplay_client); std::lock_guard<std::mutex> lk(crit_netplay_client);