Permalink
Browse files

Requested changes.

  • Loading branch information...
LunaMoo committed Nov 14, 2017
1 parent f8f4acc commit 2ff4104ddf2ab185904403b7863fe1fa7f65efda
Showing with 12 additions and 15 deletions.
  1. +1 −1 Core/AVIDump.cpp
  2. +2 −2 Core/HLE/__sceAudio.cpp
  3. +1 −1 Core/HLE/sceKernelTime.cpp
  4. +1 −1 Core/HLE/sceKernelTime.h
  5. +6 −9 Core/SaveState.cpp
  6. +1 −1 UI/EmuScreen.cpp
View
@@ -92,7 +92,7 @@ bool AVIDump::CreateAVI() {
// Use gameID_EmulatedTimestamp for filename
std::string discID = g_paramSFO.GetDiscID();
std::string video_file_name = StringFromFormat("%s%s_%d.avi", GetSysDirectory(DIRECTORY_VIDEO).c_str(), discID.c_str(), returnEmulatedTime()).c_str();
std::string video_file_name = StringFromFormat("%s%s_%d.avi", GetSysDirectory(DIRECTORY_VIDEO).c_str(), discID.c_str(), KernelTimeNow()).c_str();
s_format_context = avformat_alloc_context();
std::stringstream s_file_index_str;
View
@@ -387,7 +387,7 @@ void __AudioUpdate(bool resetRecording) {
if (g_Config.bSaveLoadResetsAVdumping && resetRecording) {
__StopLogAudio();
std::string discID = g_paramSFO.GetDiscID();
std::string audio_file_name = StringFromFormat("%s%s_%d.wav", GetSysDirectory(DIRECTORY_AUDIO).c_str(), discID.c_str(), returnEmulatedTime()).c_str();
std::string audio_file_name = StringFromFormat("%s%s_%d.wav", GetSysDirectory(DIRECTORY_AUDIO).c_str(), discID.c_str(), KernelTimeNow()).c_str();
INFO_LOG(COMMON, "Restarted audio recording to: %s", audio_file_name.c_str());
if (!File::Exists(GetSysDirectory(DIRECTORY_AUDIO)))
File::CreateDir(GetSysDirectory(DIRECTORY_AUDIO));
@@ -398,7 +398,7 @@ void __AudioUpdate(bool resetRecording) {
if (g_Config.bDumpAudio) {
// Use gameID_EmulatedTimestamp for filename
std::string discID = g_paramSFO.GetDiscID();
std::string audio_file_name = StringFromFormat("%s%s_%d.wav", GetSysDirectory(DIRECTORY_AUDIO).c_str(), discID.c_str(), returnEmulatedTime()).c_str();
std::string audio_file_name = StringFromFormat("%s%s_%d.wav", GetSysDirectory(DIRECTORY_AUDIO).c_str(), discID.c_str(), KernelTimeNow()).c_str();
INFO_LOG(COMMON,"Recording audio to: %s", audio_file_name.c_str());
// Create the path just in case it doesn't exist
if (!File::Exists(GetSysDirectory(DIRECTORY_AUDIO)))
@@ -172,6 +172,6 @@ u32 sceKernelLibcGettimeofday(u32 timeAddr, u32 tzAddr)
return 0;
}
u32 returnEmulatedTime() {
u32 KernelTimeNow() {
return (u32)start_time + (u32)(CoreTiming::GetGlobalTimeUs() / 1000000ULL);
}
View
@@ -27,7 +27,7 @@ int sceKernelSysClock2USec(u32 sysclockPtr, u32 highPtr, u32 lowPtr);
int sceKernelSysClock2USecWide(u32 lowClock, u32 highClock, u32 lowPtr, u32 highPtr);
u64 sceKernelUSec2SysClockWide(u32 usec);
u32 sceKernelLibcClock();
u32 returnEmulatedTime();
u32 KernelTimeNow();
void __KernelTimeInit();
void __KernelTimeDoState(PointerWrap &p);
View
@@ -49,9 +49,6 @@
#ifndef MOBILE_DEVICE
#include "Core/AVIDump.h"
#include "Core/HLE/__sceAudio.h"
AVIDump video;
WAVDump audio;
#endif
namespace SaveState
@@ -602,11 +599,11 @@ namespace SaveState
#ifndef MOBILE_DEVICE
if (g_Config.bSaveLoadResetsAVdumping) {
if (g_Config.bDumpFrames) {
video.Stop();
video.Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight);
AVIDump::Stop();
AVIDump::Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight);
}
if (g_Config.bDumpAudio) {
audio.Reset();
WAVDump::Reset();
}
}
#endif
@@ -637,11 +634,11 @@ namespace SaveState
#ifndef MOBILE_DEVICE
if (g_Config.bSaveLoadResetsAVdumping) {
if (g_Config.bDumpFrames) {
video.Stop();
video.Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight);
AVIDump::Stop();
AVIDump::Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight);
}
if (g_Config.bDumpAudio) {
audio.Reset();
WAVDump::Reset();
}
}
#endif
View
@@ -79,7 +79,7 @@
#endif
#ifndef MOBILE_DEVICE
AVIDump avi;
static AVIDump avi;
#endif
static bool frameStep_;

0 comments on commit 2ff4104

Please sign in to comment.