From dbf1c2c1e763f7920753a772b620f6efb65417d8 Mon Sep 17 00:00:00 2001 From: "Szornak, Karol" Date: Wed, 25 Sep 2024 16:29:51 +0000 Subject: [PATCH] [common][clang-format] Change enum settings Setting one enumerator per line + applying new settings to all files --- .clang-format | 1 + CCodeFiles/src/include/openglArguments.h | 6 +- LevelZero/common/include/l0StateDynamic.h | 6 +- LevelZero/common/include/l0Tools.h | 19 +++- OpenCL/common/include/openclArguments.h | 5 +- OpenCL/common/include/openclTools.h | 31 ++++++- OpenGL/common/include/gitsFunctions.h | 5 +- OpenGL/common/include/mapping.h | 20 ++-- OpenGL/common/include/openglArguments.h | 17 +++- OpenGL/common/include/openglDrivers.h | 7 +- OpenGL/common/include/ptblLibrary.h | 19 +++- OpenGL/common/include/stateObjects.h | 7 +- Vulkan/common/include/vkWindowing.h | 7 +- Vulkan/common/include/vulkanDrivers.h | 5 +- Vulkan/common/include/vulkanStateDynamic.h | 7 +- common/include/MemorySniffer.h | 7 +- common/include/apis_iface.h | 5 +- common/include/argument.h | 6 +- common/include/config.h | 6 +- common/include/configTypes.h | 103 +++++++++++++++++---- common/include/log.h | 5 +- common/include/lua_bindings.h | 8 +- common/include/messageBus.h | 11 ++- common/include/runner.h | 6 +- common/include/streams.h | 6 +- player/include/player.h | 6 +- 26 files changed, 272 insertions(+), 59 deletions(-) diff --git a/.clang-format b/.clang-format index 2e9d0b5..e2d694f 100644 --- a/.clang-format +++ b/.clang-format @@ -13,6 +13,7 @@ ReflowComments: false AllowShortFunctionsOnASingleLine: Empty PenaltyReturnTypeOnItsOwnLine: 999 InsertNewlineAtEOF: true +AllowShortEnumsOnASingleLine: false --- Language: Json DisableFormat: true \ No newline at end of file diff --git a/CCodeFiles/src/include/openglArguments.h b/CCodeFiles/src/include/openglArguments.h index c47c0fa..a45aa03 100644 --- a/CCodeFiles/src/include/openglArguments.h +++ b/CCodeFiles/src/include/openglArguments.h @@ -18,7 +18,11 @@ namespace gits { struct CArgument {}; struct CCodeOStream : std::ostream {}; -enum MappedArrayAction { ADD_MAPPING = 0, REMOVE_MAPPING = 1, NO_ACTION = 2 }; +enum MappedArrayAction { + ADD_MAPPING = 0, + REMOVE_MAPPING = 1, + NO_ACTION = 2 +}; namespace OpenGL { diff --git a/LevelZero/common/include/l0StateDynamic.h b/LevelZero/common/include/l0StateDynamic.h index be84b67..245acbd 100644 --- a/LevelZero/common/include/l0StateDynamic.h +++ b/LevelZero/common/include/l0StateDynamic.h @@ -299,7 +299,11 @@ struct CCommandListState : public CState { uint32_t cmdListNumber = 0U; uint32_t cmdQueueNumber = 0U; struct Action { - enum Type { Normal, Reset, Signal }; + enum Type { + Normal, + Reset, + Signal + }; Type type = Type::Normal; ze_event_handle_t signalEvent = nullptr; std::vector waitEvents; diff --git a/LevelZero/common/include/l0Tools.h b/LevelZero/common/include/l0Tools.h index 7edd857..fb5c491 100644 --- a/LevelZero/common/include/l0Tools.h +++ b/LevelZero/common/include/l0Tools.h @@ -41,7 +41,11 @@ void SaveImage(const std::filesystem::path& dir, const ze_image_desc_t& desc, const std::string& name); size_t CalculateImageSize(ze_image_desc_t desc); -enum class KernelArgType { pointer = 1, buffer, image }; +enum class KernelArgType { + pointer = 1, + buffer, + image +}; void PrepareArguments(const CKernelExecutionInfo* kernelInfo, std::vector& argDumpStates, CStateDynamic& sd, @@ -55,7 +59,11 @@ void DumpReadyArguments(std::vector& readyArgVector, const CKernelExecutionInfo* kernelInfo); bool CaptureKernels(const Config& cfg); bool CaptureImages(const Config& cfg); -enum class UnifiedMemoryType : unsigned { host = 1 << 0, device = 1 << 1, shared = 1 << 2 }; +enum class UnifiedMemoryType : unsigned { + host = 1 << 0, + device = 1 << 1, + shared = 1 << 2 +}; bool CheckCfgZeroInitialization(const Config& cfg); bool ZeroInitializeUsm(CDriver& driver, const ze_command_list_handle_t& commandList, @@ -79,7 +87,12 @@ void* GetOffsetPointer(void* ptr, const uintptr_t& offset); std::pair GetAllocFromOriginalPtr(void* originalPtr, const CStateDynamic& sd); size_t GetSizeFromCopyRegion(const ze_copy_region_t* region); bool IsNullIndirectPointersInBufferEnabled(const Config& cfg); -enum class AllocStateType : unsigned { pointer, global_pointer, function_pointer, virtual_pointer }; +enum class AllocStateType : unsigned { + pointer, + global_pointer, + function_pointer, + virtual_pointer +}; bool IsControlledSubmission(const ze_command_queue_desc_t* desc); bool IsControlledSubmission(const ze_command_list_desc_t* desc); bool ShouldDumpSpv(bool dumpSpv, const ze_module_desc_t* desc); diff --git a/OpenCL/common/include/openclArguments.h b/OpenCL/common/include/openclArguments.h index 55100fd..e5d6668 100644 --- a/OpenCL/common/include/openclArguments.h +++ b/OpenCL/common/include/openclArguments.h @@ -101,7 +101,10 @@ class CProgramSource : public CArgumentFileText { size_t text_length = 0; public: - enum ProgramType { PROGRAM_SOURCE, PROGRAM_BINARY }; + enum ProgramType { + PROGRAM_SOURCE, + PROGRAM_BINARY + }; CProgramSource() {} CProgramSource(cl_uint count, const char** strings, const size_t* lengths); CProgramSource(const unsigned char* binary, const size_t length); diff --git a/OpenCL/common/include/openclTools.h b/OpenCL/common/include/openclTools.h index 1dea8ea..8be2478 100644 --- a/OpenCL/common/include/openclTools.h +++ b/OpenCL/common/include/openclTools.h @@ -55,11 +55,32 @@ COclLog& COclLog::operator<<(const T& t) { }; typedef unsigned mem_signature_t; -enum class UnifiedMemoryType : unsigned { host = 1 << 0, device = 1 << 1, shared = 1 << 2 }; -enum class KernelArgType { pointer = 1, mem, sampler, usm, svm }; -enum class KernelSetType { normal = 1, usm, svm }; -enum class KernelExecInfoType : unsigned { pointers = 1, boolean, uint }; -enum class ProgramBinaryLink : uint8_t { binary = 1, program }; +enum class UnifiedMemoryType : unsigned { + host = 1 << 0, + device = 1 << 1, + shared = 1 << 2 +}; +enum class KernelArgType { + pointer = 1, + mem, + sampler, + usm, + svm +}; +enum class KernelSetType { + normal = 1, + usm, + svm +}; +enum class KernelExecInfoType : unsigned { + pointers = 1, + boolean, + uint +}; +enum class ProgramBinaryLink : uint8_t { + binary = 1, + program +}; size_t PixelSize(const cl_image_format& imageFormat); size_t QuerySize(const cl_mem clMem); diff --git a/OpenGL/common/include/gitsFunctions.h b/OpenGL/common/include/gitsFunctions.h index a995b0d..3af6742 100644 --- a/OpenGL/common/include/gitsFunctions.h +++ b/OpenGL/common/include/gitsFunctions.h @@ -210,7 +210,10 @@ class CgitsRenderbufferStorage : public CFunction { } public: - enum RenderbufferStorageType { RENDER_BUFFER, RENDER_BUFFER_EXT }; + enum RenderbufferStorageType { + RENDER_BUFFER, + RENDER_BUFFER_EXT + }; CGLuint _renderbufferStorageType; void renderBufferStorageRun(); void renderBufferStorageEXTRun(); diff --git a/OpenGL/common/include/mapping.h b/OpenGL/common/include/mapping.h index 5a42791..57ba34a 100644 --- a/OpenGL/common/include/mapping.h +++ b/OpenGL/common/include/mapping.h @@ -108,15 +108,21 @@ void* gl_name_cast(int name) { template struct MappedObjectTraits { - enum { native = Native }; // is this native api object or GL object - enum { shared = Shared }; // is the object shared in multiple contexts + enum { + native = Native + }; // is this native api object or GL object + enum { + shared = Shared + }; // is the object shared in multiple contexts enum { legacy = Legacy - }; // does the object support bind w/o gen in some ctxs - // 0 - requires mapping everywhere - // 1 - doesn't require mapping in compat desktop - // 2 - doesn't require mapping in ES context - enum { nezero = Nezero }; // does the object name 0 map to itself + }; // does the object support bind w/o gen in some ctxs + // 0 - requires mapping everywhere + // 1 - doesn't require mapping in compat desktop + // 2 - doesn't require mapping in ES context + enum { + nezero = Nezero + }; // does the object name 0 map to itself }; bool isMappingRequired(MapObjects mapObject, int legacy); diff --git a/OpenGL/common/include/openglArguments.h b/OpenGL/common/include/openglArguments.h index 8bb1e14..ffb80c5 100644 --- a/OpenGL/common/include/openglArguments.h +++ b/OpenGL/common/include/openglArguments.h @@ -1372,7 +1372,11 @@ class CShaderSource : public CArgumentFileText { const char* text_cstr; public: - enum ShaderType { SHADER_SOURCE, SHADER_PROGRAM, PROGRAM_STRING }; + enum ShaderType { + SHADER_SOURCE, + SHADER_PROGRAM, + PROGRAM_STRING + }; CShaderSource() : text_cstr(nullptr) {} CShaderSource(GLuint shaderObj, GLsizei count, @@ -1595,8 +1599,15 @@ class CCoherentBufferUpdate : public CArgument { uint32_t _length; uint32_t _target; std::vector playerCache; - enum UpdateType { TEXTURE_UPDATE, PER_DRAWCALL_UPDATE, PER_FRAME_UPDATE }; - enum UpdateMode { UPDATE_ALL, UPDATE_BOUND }; + enum UpdateType { + TEXTURE_UPDATE, + PER_DRAWCALL_UPDATE, + PER_FRAME_UPDATE + }; + enum UpdateMode { + UPDATE_ALL, + UPDATE_BOUND + }; TCoherentBufferData( uint64_t hash, uint32_t offset, uint32_t buffer_name, uint32_t length, uint32_t target) diff --git a/OpenGL/common/include/openglDrivers.h b/OpenGL/common/include/openglDrivers.h index 43641d2..69d8cef 100644 --- a/OpenGL/common/include/openglDrivers.h +++ b/OpenGL/common/include/openglDrivers.h @@ -887,7 +887,12 @@ class CGlDriver { CGlDriver(const CGlDriver& other) = delete; CGlDriver& operator=(const CGlDriver& other) = delete; ~CGlDriver(); - enum TApiType { API_GL, API_GLES1, API_GLES2, API_NULL }; + enum TApiType { + API_GL, + API_GLES1, + API_GLES2, + API_NULL + }; void Initialize(TApiType api) WEAK; diff --git a/OpenGL/common/include/ptblLibrary.h b/OpenGL/common/include/ptblLibrary.h index 07fbc04..eab95e2 100644 --- a/OpenGL/common/include/ptblLibrary.h +++ b/OpenGL/common/include/ptblLibrary.h @@ -20,7 +20,12 @@ namespace gits { namespace OpenGL { //*********************** Native API **************************** struct PtblNativeAPI { - enum Type { UNKNOWN = 0, WGL, GLX, EGL }; + enum Type { + UNKNOWN = 0, + WGL, + GLX, + EGL + }; static Type _api; static Type _streamApi; @@ -94,8 +99,16 @@ inline void PtblNtvStreamApi(PtblNativeAPI::Type api) { } //*********************** GL Params **************************** -enum PtblGLProfile { Compat = 300, Core, ES }; -enum PtblCtxParam { VerMinor = 400, VerMajor, Profile }; +enum PtblGLProfile { + Compat = 300, + Core, + ES +}; +enum PtblCtxParam { + VerMinor = 400, + VerMajor, + Profile +}; typedef std::map PtblCtxParams; //******************* PF Params ************************************ diff --git a/OpenGL/common/include/stateObjects.h b/OpenGL/common/include/stateObjects.h index d606405..cfa7efb 100644 --- a/OpenGL/common/include/stateObjects.h +++ b/OpenGL/common/include/stateObjects.h @@ -833,7 +833,12 @@ struct CBufferStateData { GLintptr mapFlushRangeOffset; GLsizeiptr mapFlushRangeLength; bool mapped; - enum buffer_type { MAP_BUFFER, MAP_BUFFER_OES, MAP_BUFFER_ARB, MAP_BUFFER_EXT }; + enum buffer_type { + MAP_BUFFER, + MAP_BUFFER_OES, + MAP_BUFFER_ARB, + MAP_BUFFER_EXT + }; buffer_type type; std::vector buffer; bool named; diff --git a/Vulkan/common/include/vkWindowing.h b/Vulkan/common/include/vkWindowing.h index 4d757fd..9fc74c6 100644 --- a/Vulkan/common/include/vkWindowing.h +++ b/Vulkan/common/include/vkWindowing.h @@ -12,7 +12,12 @@ namespace gits { namespace Vulkan { -enum class DisplayProtocol { NONE, XCB, XLIB, WAYLAND }; +enum class DisplayProtocol { + NONE, + XCB, + XLIB, + WAYLAND +}; static DisplayProtocol _displayProtocol; //********************************* Player Window *********************************** diff --git a/Vulkan/common/include/vulkanDrivers.h b/Vulkan/common/include/vulkanDrivers.h index 275e12a..07125c7 100644 --- a/Vulkan/common/include/vulkanDrivers.h +++ b/Vulkan/common/include/vulkanDrivers.h @@ -59,7 +59,10 @@ struct CVkDeviceDispatchTable { class CVkDriver { public: - enum class DriverMode { INTERCEPTOR, LAYER }; + enum class DriverMode { + INTERCEPTOR, + LAYER + }; CVkDriver(); ~CVkDriver(); CVkDriver(const CVkDriver& other) = delete; diff --git a/Vulkan/common/include/vulkanStateDynamic.h b/Vulkan/common/include/vulkanStateDynamic.h index 74fe0e7..67a435f 100644 --- a/Vulkan/common/include/vulkanStateDynamic.h +++ b/Vulkan/common/include/vulkanStateDynamic.h @@ -92,7 +92,12 @@ typedef enum _VulkanResourceType { // Creation function -enum class CreationFunction { KHR_EXTENSION, CORE_1_0, CORE_1_1, CORE_1_2 }; +enum class CreationFunction { + KHR_EXTENSION, + CORE_1_0, + CORE_1_1, + CORE_1_2 +}; // Unique handle diff --git a/common/include/MemorySniffer.h b/common/include/MemorySniffer.h index 6299744..cf9b8c3 100644 --- a/common/include/MemorySniffer.h +++ b/common/include/MemorySniffer.h @@ -38,7 +38,12 @@ unsigned GetVirtualMemoryPageSize(); void* GetPage(void* addr); const void* GetPage(const void* addr); -enum PageMemoryProtection { READ_ONLY, READ_WRITE, WRITE_ONLY, NONE }; +enum PageMemoryProtection { + READ_ONLY, + READ_WRITE, + WRITE_ONLY, + NONE +}; bool SetPagesProtection(PageMemoryProtection access, void* ptr, size_t size = 1); class MemorySniffer; diff --git a/common/include/apis_iface.h b/common/include/apis_iface.h index 2beb0a3..2068033 100644 --- a/common/include/apis_iface.h +++ b/common/include/apis_iface.h @@ -27,7 +27,10 @@ class ApisIface { OpenCL, LevelZero, }; - enum TApiType { A3D, ACompute }; + enum TApiType { + A3D, + ACompute + }; class ApiIface { TApi _api; diff --git a/common/include/argument.h b/common/include/argument.h index 82c9564..41bf5cd 100644 --- a/common/include/argument.h +++ b/common/include/argument.h @@ -613,7 +613,11 @@ class CArgumentSizedArray : public CArgument { * If accessed as non const mappings are being updated * This parameter is written to the stream */ -enum MappedArrayAction { ADD_MAPPING = 0, REMOVE_MAPPING = 1, NO_ACTION = 2 }; +enum MappedArrayAction { + ADD_MAPPING = 0, + REMOVE_MAPPING = 1, + NO_ACTION = 2 +}; template class CArgumentMappedSizedArray : public CArgument { diff --git a/common/include/config.h b/common/include/config.h index 68d46ef..59627cf 100644 --- a/common/include/config.h +++ b/common/include/config.h @@ -28,7 +28,11 @@ namespace gits { struct Config { - enum TMode { MODE_UNKNOWN, MODE_RECORDER, MODE_PLAYER }; + enum TMode { + MODE_UNKNOWN, + MODE_RECORDER, + MODE_PLAYER + }; static const std::string CONFIG_FILE_NAME; static std::filesystem::path GetConfigPath(const std::filesystem::path& appDir); diff --git a/common/include/configTypes.h b/common/include/configTypes.h index 927d413..50dfe8d 100644 --- a/common/include/configTypes.h +++ b/common/include/configTypes.h @@ -147,7 +147,11 @@ struct NamedValuesBase { Domain value_; }; -enum class TRecordingMode { NONE, BINARY, CCODE }; +enum class TRecordingMode { + NONE, + BINARY, + CCODE +}; struct RecordingModeOpt : NamedValuesBase { static void describe_type() { @@ -159,7 +163,12 @@ struct RecordingModeOpt : NamedValuesBase { } }; -enum class TOpenGLRecorderMode { ALL, FRAMES, SINGLE_DRAW, DRAWS_RANGE }; +enum class TOpenGLRecorderMode { + ALL, + FRAMES, + SINGLE_DRAW, + DRAWS_RANGE +}; struct OpenGLRecorderModeOpt : NamedValuesBase { static void describe_type() { @@ -198,7 +207,11 @@ struct VulkanRecorderModeOpt : NamedValuesBase { static void describe_type() { @@ -210,7 +223,10 @@ struct OpenCLRecorderModeOpt : NamedValuesBase { @@ -222,7 +238,12 @@ struct LevelZeroRecorderModeOpt } }; -enum class TForcedGLProfile { NO_PROFILE_FORCED, COMPAT, CORE, ES }; +enum class TForcedGLProfile { + NO_PROFILE_FORCED, + COMPAT, + CORE, + ES +}; struct GLProfileOpt : NamedValuesBase { static void describe_type() { @@ -235,7 +256,12 @@ struct GLProfileOpt : NamedValuesBase { } }; -enum class TForcedGLNativeApi { NO_NTV_API_FORCED, EGL, GLX, WGL }; +enum class TForcedGLNativeApi { + NO_NTV_API_FORCED, + EGL, + GLX, + WGL +}; struct GLNativeApiOpt : NamedValuesBase { static void describe_type() { @@ -248,7 +274,11 @@ struct GLNativeApiOpt : NamedValuesBase { } }; -enum class TBuffersState { CAPTURE_ALWAYS, RESTORE, MIXED }; +enum class TBuffersState { + CAPTURE_ALWAYS, + RESTORE, + MIXED +}; struct BuffersStateOpt : NamedValuesBase { static void describe_type() { @@ -260,7 +290,11 @@ struct BuffersStateOpt : NamedValuesBase { } }; -enum class TTexturesState { CAPTURE_ALWAYS, RESTORE, MIXED }; +enum class TTexturesState { + CAPTURE_ALWAYS, + RESTORE, + MIXED +}; struct TexturesStateOpt : NamedValuesBase { static void describe_type() { @@ -272,7 +306,11 @@ struct TexturesStateOpt : NamedValuesBase { } }; -enum class TMemoryUpdateStates { ALL_MAPPED, ONLY_USED, USING_TAGS }; +enum class TMemoryUpdateStates { + ALL_MAPPED, + ONLY_USED, + USING_TAGS +}; struct MemoryUpdateStateOpt : NamedValuesBase { static void describe_type() { @@ -308,7 +346,10 @@ struct MemoryTrackingModeOpt : NamedValuesBase { @@ -320,7 +361,11 @@ struct MemoryStateRestorationOpt } }; -enum class TBufferStateRestoration { NONE, WITH_NON_HOST_VISIBLE_MEMORY_ONLY, ALL }; +enum class TBufferStateRestoration { + NONE, + WITH_NON_HOST_VISIBLE_MEMORY_ONLY, + ALL +}; struct BufferStateRestorationOpt : NamedValuesBase { @@ -334,7 +379,10 @@ struct BufferStateRestorationOpt } }; -enum class TWindowsKeyHandling { MESSAGE_LOOP, ASYNC_KEY_STATE }; +enum class TWindowsKeyHandling { + MESSAGE_LOOP, + ASYNC_KEY_STATE +}; struct WindowsKeyHandlingOpt : NamedValuesBase { static void describe_type() { @@ -345,7 +393,10 @@ struct WindowsKeyHandlingOpt : NamedValuesBase { static void describe_type() { @@ -356,7 +407,11 @@ struct VKCaptureGroupTypeOpt : NamedValuesBase { static void describe_type() { @@ -368,7 +423,11 @@ struct DeviceTypeOpt : NamedValuesBase { } }; -enum class TVkRenderDocCaptureMode { NONE, FRAMES, QUEUE_SUBMIT }; +enum class TVkRenderDocCaptureMode { + NONE, + FRAMES, + QUEUE_SUBMIT +}; struct VkRenderDocCaptureOpt : NamedValuesBase { static void describe_type() { @@ -380,8 +439,18 @@ struct VkRenderDocCaptureOpt : NamedValuesBase { static void describe_type() { diff --git a/common/include/log.h b/common/include/log.h index e9fc01c..9eab9fd 100644 --- a/common/include/log.h +++ b/common/include/log.h @@ -64,7 +64,10 @@ enum LogLevel { OFF = 6, // Important. Special level that shows messages even when logging is off. }; -enum class TraceData { VK_STRUCTS, FRAME_NUMBER }; +enum class TraceData { + VK_STRUCTS, + FRAME_NUMBER +}; const TraceData TraceDataAll[] = {TraceData::VK_STRUCTS, TraceData::FRAME_NUMBER}; diff --git a/common/include/lua_bindings.h b/common/include/lua_bindings.h index 02f1fd3..1d119e2 100644 --- a/common/include/lua_bindings.h +++ b/common/include/lua_bindings.h @@ -131,14 +131,18 @@ struct ArgNum; template struct ArgNum { - enum { value = sizeof...(Args) }; + enum { + value = sizeof...(Args) + }; }; template struct Argnum; template struct Argnum { - enum { value = sizeof...(T) }; + enum { + value = sizeof...(T) + }; }; template diff --git a/common/include/messageBus.h b/common/include/messageBus.h index 20eb149..8b8511d 100644 --- a/common/include/messageBus.h +++ b/common/include/messageBus.h @@ -18,8 +18,15 @@ #include namespace gits { -enum PublisherId { PUBLISHER_PLAYER = 0, PUBLISHER_RECORDER, PUBLISHER_PLUGIN }; -enum TopicId { TOPIC_NONE = 0, TOPIC_LOG }; +enum PublisherId { + PUBLISHER_PLAYER = 0, + PUBLISHER_RECORDER, + PUBLISHER_PLUGIN +}; +enum TopicId { + TOPIC_NONE = 0, + TOPIC_LOG +}; struct Topic { PublisherId publisherId{}; TopicId topicId{}; diff --git a/common/include/runner.h b/common/include/runner.h index 497cbeb..efb95c4 100644 --- a/common/include/runner.h +++ b/common/include/runner.h @@ -41,7 +41,11 @@ class CRunner : private gits::noncopyable { class CRunner::CHandler : private gits::noncopyable { public: - enum TSkipType { SKIP_YES, SKIP_NO, SKIP_FORCE }; + enum TSkipType { + SKIP_YES, + SKIP_NO, + SKIP_FORCE + }; CHandler(const CHandler& other) = delete; CHandler& operator=(const CHandler& other) = delete; diff --git a/common/include/streams.h b/common/include/streams.h index 2b21a22..b02a83e 100644 --- a/common/include/streams.h +++ b/common/include/streams.h @@ -66,7 +66,11 @@ void read_name_from_stream(std::istream& i, T*& value) { * * gits::CBinOStream class is a binary file output stream. */ -enum WriteType : uint8_t { STANDALONE, PACKAGE, LARGE_STANDALONE }; +enum WriteType : uint8_t { + STANDALONE, + PACKAGE, + LARGE_STANDALONE +}; class CBinOStream : public std::ostream { std::streambuf* _buf; CompressionType _compressionType; diff --git a/player/include/player.h b/player/include/player.h index bd8b69a..e82c647 100644 --- a/player/include/player.h +++ b/player/include/player.h @@ -34,7 +34,11 @@ class CFrameRateCounter; */ class CPlayer : private gits::noncopyable { public: - enum TState { STATE_RUNNING, STATE_PAUSED, STATE_FINISHED }; + enum TState { + STATE_RUNNING, + STATE_PAUSED, + STATE_FINISHED + }; private: TState _state; /**< @brief defines current player state */