diff options
| author | Grigoriy <[email protected]> | 2018-04-02 16:38:19 +0300 |
|---|---|---|
| committer | Grigoriy <[email protected]> | 2018-04-02 16:38:19 +0300 |
| commit | ef52f45369351ea62e4e8d2a66a3bdaaa19016ba (patch) | |
| tree | bfb1c7fe4393326a0370e8fda4bd8428a2020b4c | |
| parent | Open group bugfix (diff) | |
| download | gfesdk-ue4plugin-ef52f45369351ea62e4e8d2a66a3bdaaa19016ba.tar.xz gfesdk-ue4plugin-ef52f45369351ea62e4e8d2a66a3bdaaa19016ba.zip | |
added more descriptive error codes, added 'unannounced' highlight type
| -rw-r--r-- | Source/NVIDIAGfeSDK/Private/TypeTranslation.cpp | 49 | ||||
| -rw-r--r-- | Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKTypes.h | 35 |
2 files changed, 74 insertions, 10 deletions
diff --git a/Source/NVIDIAGfeSDK/Private/TypeTranslation.cpp b/Source/NVIDIAGfeSDK/Private/TypeTranslation.cpp index bbd53c4..3fe76ae 100644 --- a/Source/NVIDIAGfeSDK/Private/TypeTranslation.cpp +++ b/Source/NVIDIAGfeSDK/Private/TypeTranslation.cpp @@ -35,6 +35,7 @@ std::map<NVGSDK_HighlightType, EGfeSDKHighlightType> kHighlightTypeSdkToUnreal = { NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT, EGfeSDKHighlightType::Achievement },
{ NVGSDK_HIGHLIGHT_TYPE_INCIDENT, EGfeSDKHighlightType::Incident },
{ NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE, EGfeSDKHighlightType::StateChange },
+ { NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED, EGfeSDKHighlightType::Unannounced },
{ NVGSDK_HIGHLIGHT_TYPE_MAX, EGfeSDKHighlightType::MAX }
};
std::map<EGfeSDKHighlightType, NVGSDK_HighlightType> kHighlightTypeUnrealToSdk = InvertMap(kHighlightTypeSdkToUnreal);
@@ -53,14 +54,46 @@ std::map<EGfeSDKHighlightSignificance, NVGSDK_HighlightSignificance> kHighlightS EGfeSDKReturnCode TranslateReturnCodeToUnreal(NVGSDK_RetCode code)
{
- switch (code)
- {
- case NVGSDK_SUCCESS: return EGfeSDKReturnCode::Success;
- case NVGSDK_SUCCESS_VERSION_OLD_SDK: return EGfeSDKReturnCode::SuccessIpcOldSdk;
- case NVGSDK_SUCCESS_VERSION_OLD_GFE: return EGfeSDKReturnCode::SuccessIpcOldGfe;
- case NVGSDK_ERR_GFE_VERSION: return EGfeSDKReturnCode::ErrorGfeVersion;
- case NVGSDK_ERR_SDK_VERSION: return EGfeSDKReturnCode::ErrorSdkVersion;
- }
+ switch (code)
+ {
+ case NVGSDK_SUCCESS: return EGfeSDKReturnCode::Success;
+ case NVGSDK_SUCCESS_VERSION_OLD_SDK: return EGfeSDKReturnCode::SuccessIpcOldSdk;
+ case NVGSDK_SUCCESS_VERSION_OLD_GFE: return EGfeSDKReturnCode::SuccessIpcOldGfe;
+ case NVGSDK_ERR_GFE_VERSION: return EGfeSDKReturnCode::ErrorGfeVersion;
+ case NVGSDK_ERR_SDK_VERSION: return EGfeSDKReturnCode::ErrorSdkVersion;
+ case NVGSDK_ERR_GENERIC: return EGfeSDKReturnCode::ErrorGeneric; + case NVGSDK_ERR_NOT_IMPLEMENTED: return EGfeSDKReturnCode::ErrorNotImplemented; + case NVGSDK_ERR_INVALID_PARAMETER: return EGfeSDKReturnCode::ErrorInvalidParameter; + case NVGSDK_ERR_NOT_SET: return EGfeSDKReturnCode::ErrorNotSet; + case NVGSDK_ERR_SHADOWPLAY_IR_DISABLED: return EGfeSDKReturnCode::ErrorShadowplayIRDisabled; + case NVGSDK_ERR_SDK_IN_USE: return EGfeSDKReturnCode::ErrorSDKInUse; + case NVGSDK_ERR_GROUP_NOT_FOUND: return EGfeSDKReturnCode::ErrorGroupNotFound; + case NVGSDK_ERR_FILE_NOT_FOUND: return EGfeSDKReturnCode::ErrorFileNotFound; + case NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED:return EGfeSDKReturnCode::ErrorHighlightsSetupFailed; + case NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED: return EGfeSDKReturnCode::ErrorHighlightsNotConfigured; + case NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED: return EGfeSDKReturnCode::ErrorHighlightSaveFailed; + case NVGSDK_ERR_UNEXPECTED_EXCEPTION: return EGfeSDKReturnCode::ErrorUnexpectedException; + case NVGSDK_ERR_NO_HIGHLIGHTS: return EGfeSDKReturnCode::ErrorNoHighlights; + case NVGSDK_ERR_NO_CONNECTION: return EGfeSDKReturnCode::ErrorNoConnection; + case NVGSDK_ERR_PERMISSION_NOT_GRANTED: return EGfeSDKReturnCode::ErrorPermissionNotGranted; + case NVGSDK_ERR_PERMISSION_DENIED: return EGfeSDKReturnCode::ErrorPermissionDenied; + case NVGSDK_ERR_INVALID_HANDLE: return EGfeSDKReturnCode::ErrorInvalidHandle; + case NVGSDK_ERR_UNHANDLED_EXCEPTION: return EGfeSDKReturnCode::ErrorUnhandledException; + case NVGSDK_ERR_OUT_OF_MEMORY: return EGfeSDKReturnCode::ErrorOutOfMemory; + case NVGSDK_ERR_LOAD_LIBRARY: return EGfeSDKReturnCode::ErrorLoadLibrary; + case NVGSDK_ERR_LIB_CALL_FAILED: return EGfeSDKReturnCode::ErrorLibraryCallFailed; + case NVGSDK_ERR_IPC_FAILED: return EGfeSDKReturnCode::ErrorIPCFailed; + case NVGSDK_ERR_CONNECTION: return EGfeSDKReturnCode::ErrorConnection; + case NVGSDK_ERR_MODULE_NOT_LOADED: return EGfeSDKReturnCode::ErrorModuleNotLoaded; + case NVGSDK_ERR_LIB_CALL_TIMEOUT: return EGfeSDKReturnCode::ErrorLibCallTimeout; + case NVGSDK_ERR_APPLICATION_LOOKUP_FAILED:return EGfeSDKReturnCode::ErrorApplicationLookupFailed; + case NVGSDK_ERR_APPLICATION_NOT_KNOWN: return EGfeSDKReturnCode::ErrorApplicationNotKnown; + case NVGSDK_ERR_FEATURE_DISABLED: return EGfeSDKReturnCode::ErrorFeatureDisabled; + case NVGSDK_ERR_APP_NO_OPTIMIZATION: return EGfeSDKReturnCode::ErrorAppNoOptimization; + case NVGSDK_ERR_APP_SETTINGS_READ: return EGfeSDKReturnCode::ErrorAppSettingsRead; + case NVGSDK_ERR_APP_SETTINGS_WRITE: return EGfeSDKReturnCode::ErrorAppSettingsWrite;
+
+ }
return (NVGSDK_SUCCEEDED(code) ? EGfeSDKReturnCode::Success : EGfeSDKReturnCode::Error);
}
diff --git a/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKTypes.h b/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKTypes.h index 02e3b79..de5a1a0 100644 --- a/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKTypes.h +++ b/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKTypes.h @@ -12,7 +12,37 @@ enum class EGfeSDKReturnCode : uint8 ErrorGfeVersion = 4,
ErrorSdkVersion = 5,
ErrorModuleNotLoaded = 6,
- ErrorWrongTimeRangeSet = 7
+ ErrorWrongTimeRangeSet = 7,
+ ErrorGeneric = 8, + ErrorNotImplemented = 9, + ErrorInvalidParameter = 10, + ErrorNotSet = 11, + ErrorShadowplayIRDisabled = 12, + ErrorSDKInUse = 13, + ErrorGroupNotFound = 14, + ErrorFileNotFound = 15, + ErrorHighlightsSetupFailed = 16, + ErrorHighlightsNotConfigured = 17, + ErrorHighlightSaveFailed = 18, + ErrorUnexpectedException = 19, + ErrorNoHighlights = 20, + ErrorNoConnection = 21, + ErrorPermissionNotGranted = 22, + ErrorPermissionDenied = 23, + ErrorInvalidHandle = 24, + ErrorUnhandledException = 25, + ErrorOutOfMemory = 26, + ErrorLoadLibrary = 27, + ErrorLibraryCallFailed = 28, + ErrorIPCFailed = 29, + ErrorConnection = 30, + ErrorLibCallTimeout = 32, + ErrorApplicationLookupFailed = 33, + ErrorApplicationNotKnown = 34, + ErrorFeatureDisabled = 35, + ErrorAppNoOptimization = 36, + ErrorAppSettingsRead = 37, + ErrorAppSettingsWrite = 38
};
UENUM(BlueprintType)
@@ -42,7 +72,8 @@ enum class EGfeSDKHighlightType : uint8 Achievement = 0x02,
Incident = 0x04,
StateChange = 0x08,
- MAX = 0x10
+ Unannounced = 0x10,
+ MAX = 0x20
};
// This different from the version in sdk_types.h because
|