sydney/EqualizerAPO
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.

Browse Source
This commit is contained in:
jthedering committed 2015-11-23 21:17:34 +00:00
1 parent a1be4cc70f
commit 57e8158efd
202 files changed
+4595 -4284
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

helpers/MemoryHelper.cpp
+23 -23
View File
@@ -1,20 +1,20 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2013 Jonas Thedering
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2013 Jonas Thedering
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "stdafx.h"
@@ -40,8 +40,8 @@
// someone forgot to add the __stdcall/WINAPI modifier to BaseAudioProcessingObject.h, so we can't use the existing declarations
extern "C"
{
HRESULT __stdcall AERT_Allocate(size_t size, void **pMemory);
HRESULT __stdcall AERT_Free(void *pMemory);
HRESULT __stdcall AERT_Allocate(size_t size, void** pMemory);
HRESULT __stdcall AERT_Free(void* pMemory);
}
#endif
@@ -52,7 +52,7 @@ void* MemoryHelper::alloc(size_t size)
size += 16;
#ifdef USE_WINDDK
HRESULT hr = AERT_Allocate(size, &memory);
if(FAILED(hr))
if (FAILED(hr))
{
size += 16;
memory = malloc(size);
@@ -61,19 +61,19 @@ void* MemoryHelper::alloc(size_t size)
}
#else
#ifdef _DEBUG
memory = _malloc_dbg(size,_NORMAL_BLOCK, __FILE__, __LINE__);
memory = _malloc_dbg(size, _NORMAL_BLOCK, __FILE__, __LINE__);
#else
memory = malloc(size);
#endif
#endif
if(memory == NULL)
if (memory == NULL)
{
LogFStatic(L"Allocation of %d bytes failed.", size);
return NULL;
}
size_t offset = 16 - ((size_t)memory) % 16;
if(alternative)
if (alternative)
offset += 16;
void* ptr = ((char*)memory) + offset;
((char*)ptr)[-1] = (char)offset;
@@ -85,27 +85,27 @@ void MemoryHelper::free(void* ptr)
{
bool alternative = false;
char offset = ((char*)ptr)[-1];
if(offset > 16)
if (offset > 16)
alternative = true;
void* memory = ((char*)ptr) - offset;
#ifdef USE_WINDDK
if(alternative)
if (alternative)
{
::free(memory);
}
else
{
HRESULT hr = AERT_Free(memory);
if(FAILED(hr))
if (FAILED(hr))
{
LogFStatic(L"Memory release failed. Error code %X", hr);
}
}
#else
#ifdef _DEBUG
_free_dbg(memory,_NORMAL_BLOCK);
_free_dbg(memory, _NORMAL_BLOCK);
#else
::free(memory);
#endif