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 #1040 from RachelBryk/movie-cleanup 

Movie cleanup
This commit is contained in:
skidau 2014-09-11 11:47:55 +10:00
parent 581c81ce1c 08db8c646b
commit 67f7e7e28b
2 changed files with 342 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

22
Source/Core/Core/Movie.h
View File

@ -35,7 +35,7 @@ struct ControllerState
{ {
bool Start:1, A:1, B:1, X:1, Y:1, Z:1; // Binary buttons, 6 bits bool Start:1, A:1, B:1, X:1, Y:1, Z:1; // Binary buttons, 6 bits
bool DPadUp:1, DPadDown:1, // Binary D-Pad buttons, 4 bits bool DPadUp:1, DPadDown:1, // Binary D-Pad buttons, 4 bits
DPadLeft:1, DPadRight:1; DPadLeft:1, DPadRight:1;
bool L:1, R:1; // Binary triggers, 2 bits bool L:1, R:1; // Binary triggers, 2 bits
bool disc:1; // Checks for disc being changed bool disc:1; // Checks for disc being changed
bool reserved:3; // Reserved bits used for padding, 4 bits bool reserved:3; // Reserved bits used for padding, 4 bits
@ -77,7 +77,7 @@ struct DTMHeader
u8 videoBackend[16]; // UTF-8 representation of the video backend u8 videoBackend[16]; // UTF-8 representation of the video backend
u8 audioEmulator[16]; // UTF-8 representation of the audio emulator u8 audioEmulator[16]; // UTF-8 representation of the audio emulator
unsigned char md5[16]; // MD5 of game iso u8 md5[16]; // MD5 of game iso
u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC)
@ -87,7 +87,7 @@ struct DTMHeader
bool bProgressive; bool bProgressive;
bool bDSPHLE; bool bDSPHLE;
bool bFastDiscSpeed; bool bFastDiscSpeed;
u8 CPUCore; // 0 = interpreter, 1 = JIT, 2 = JITIL u8 CPUCore; // 0 = interpreter, 1 = JIT, 2 = JITIL
bool bEFBAccessEnable; bool bEFBAccessEnable;
bool bEFBCopyEnable; bool bEFBCopyEnable;
bool bCopyEFBToTexture; bool bCopyEFBToTexture;
@ -97,16 +97,16 @@ struct DTMHeader
bool bUseRealXFB; bool bUseRealXFB;
u8 memcards; u8 memcards;
bool bClearSave; // Create a new memory card when playing back a movie if true bool bClearSave; // Create a new memory card when playing back a movie if true
u8 bongos; u8 bongos;
bool bSyncGPU; bool bSyncGPU;
bool bNetPlay; bool bNetPlay;
u8 reserved[13]; // Padding for any new config options u8 reserved[13]; // Padding for any new config options
u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 discChange[40]; // Name of iso file to switch to, for two disc games.
u8 revision[20]; // Git hash u8 revision[20]; // Git hash
u32 DSPiromHash; u32 DSPiromHash;
u32 DSPcoefHash; u32 DSPcoefHash;
u64 tickCount; // Number of ticks in the recording u64 tickCount; // Number of ticks in the recording
u8 reserved2[11]; // Make heading 256 bytes, just because we can u8 reserved2[11]; // Make heading 256 bytes, just because we can
}; };
static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes"); static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes");