jp9000/obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 0.60

Browse Source 
Also, made is so that non-monotonic timestamp values automatically get
clamped to the last time value.
This commit is contained in:
jp9000 2014-02-02 19:50:51 -07:00
parent 8f126a22c1
commit edf57656cb
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OBSApi/OBSApi.cpp
View File

@ -244,7 +244,7 @@ LPBYTE GetCursorData(HICON hIcon, ICONINFO &ii, UINT &width, UINT &height)
}
extern LARGE_INTEGER clockFreq;
LONGLONG lastQPCTime;
volatile LONGLONG lastQPCTime = 0;
QWORD GetQPCTimeNS()
{
@ -252,7 +252,11 @@ QWORD GetQPCTimeNS()
QueryPerformanceCounter(&currentTime);
if (currentTime.QuadPart < lastQPCTime)
{
Log (TEXT("GetQPCTimeNS: WTF, clock went backwards! %I64d < %I64d"), currentTime.QuadPart, lastQPCTime);
currentTime.QuadPart = lastQPCTime;
}
lastQPCTime = currentTime.QuadPart;
double timeVal = double(currentTime.QuadPart);
@ -268,7 +272,11 @@ QWORD GetQPCTime100NS()
QueryPerformanceCounter(&currentTime);
if (currentTime.QuadPart < lastQPCTime)
{
Log (TEXT("GetQPCTime100NS: WTF, clock went backwards! %I64d < %I64d"), currentTime.QuadPart, lastQPCTime);
currentTime.QuadPart = lastQPCTime;
}
lastQPCTime = currentTime.QuadPart;
double timeVal = double(currentTime.QuadPart);
@ -284,7 +292,11 @@ QWORD GetQPCTimeMS()
QueryPerformanceCounter(&currentTime);
if (currentTime.QuadPart < lastQPCTime)
{
Log (TEXT("GetQPCTimeMS: WTF, clock went backwards! %I64d < %I64d"), currentTime.QuadPart, lastQPCTime);
currentTime.QuadPart = lastQPCTime;
}
lastQPCTime = currentTime.QuadPart;
QWORD timeVal = currentTime.QuadPart;

3
OBSApi/Utility/XString.cpp
View File

@ -704,6 +704,9 @@ String String::Left(UINT iOffset)
String String::Mid(UINT iStart, UINT iEnd)
{
if (!IsValid())
return String();
if( (iStart >= curLength) ||
(iEnd > curLength || iEnd <= iStart) )
{

6
Source/Main.h
View File

@ -79,9 +79,9 @@ extern TCHAR lpAppDataPath[MAX_PATH];
#define OBS_VERSION_SUFFIX ""
#endif
#define OBS_VERSION 0x005902 //version number is 0xMMmmtt (Major.minor.whatever - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.60b test build 9"
#define OBS_TEST_BUILD 1 //define this if releasing a test build to disable the auto updater
#define OBS_VERSION 0x006000 //version number is 0xMMmmtt (Major.minor.whatever - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.60b"
//#define OBS_TEST_BUILD 1 //define this if releasing a test build to disable the auto updater
#define OBS_VERSION_STRING_ANSI OBS_VERSION_STRING_RAW OBS_VERSION_SUFFIX
#define OBS_VERSION_STRING TEXT(OBS_VERSION_STRING_RAW) TEXT(OBS_VERSION_SUFFIX)