Skip to content

Commit b04294e

Browse files
htartisanhtartisan
committed
code updates & fixes
1 parent 353616a commit b04294e

File tree

9 files changed

+159
-60
lines changed

9 files changed

+159
-60
lines changed

‎Src/Buffer/CAudioBuffer.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ template <class T> class CSimpleAudioBuffer : public CErrorHandler
137137

138138
m_arraySize = (m_blockSize * m_numChannels); // arraySize = total numner of samples in the buffer
139139

140-
m_pBuffer = calloc(m_arraySize, sizeof(T));
140+
m_pBuffer = (T*) calloc(m_arraySize, sizeof(T));
141141

142142
if (m_pBuffer == nullptr)
143143
{
@@ -167,11 +167,9 @@ template <class T> class CSimpleAudioBuffer : public CErrorHandler
167167

168168
if (m_pBuffer != nullptr)
169169
{
170-
free(m_pBuffer);
170+
::free(m_pBuffer);
171171
}
172172

173-
m_pBuffer = nullptr;
174-
175173
m_bAllocated = false;
176174
}
177175

@@ -337,7 +335,7 @@ template <class T> class CSimpleAudioBuffer : public CErrorHandler
337335

338336
if (offset >= m_arraySize)
339337
{
340-
return 0;
338+
return;
341339
}
342340

343341
*(m_pBuffer + offset) = value;

‎Src/Buffer/CRingBuffer.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
//****************************************************************************
2+
// FILE: CRingBuffeer.h
3+
//
4+
// DEESC: Buffer class with configurable data type
5+
//
6+
// AUTHOR: Russ Barker
7+
//
8+
9+
110
#ifndef _RING_BUFFER_H_
211
#define _RING_BUFFER_H_
312

4-
#include "logging.h"
13+
14+
#include "../Logging/Logging.h"
515

616
#include <mutex>
717
#include <string>

‎Src/Buffer/CVRingBuffer.h

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
//****************************************************************************
2+
// FILE: CVRingBuffeer.h
3+
//
4+
// DEESC: Buffer class with configurable data type,
5+
// derrived from std::vector.
6+
//
7+
// AUTHOR: Russ Barker
8+
//
9+
10+
11+
112
#ifndef _V_RING_BUFFER_H_
213
#define _V_RING_BUFFER_H_
314

4-
#include "logging.h"
15+
#include "../Logging/Logging.h"
516

617
#include <mutex>
718
#include <string>

‎Src/FileIO/CAudioFileIO.cpp

+73-12
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,13 @@ bool CRawFileIO::writeSample(const int16_t data, const unsigned int chl)
844844
{
845845
if (chl >= m_numChannels || m_eMode == eFileIoMode_input || m_pFramebuffer == nullptr || m_nBitsPerSample != 16)
846846
{
847-
LogDebug("bad params chl={}, m_numChannels={}, m_eMode={}, eFileIoMode_input={}", chl, m_numChannels,
848-
m_eMode, eFileIoMode_input);
847+
LogDebug
848+
(
849+
"bad param - chl={}, numChannels={}, eMode={}",
850+
chl,
851+
m_numChannels,
852+
(int) m_eMode
853+
);
849854
return false;
850855
}
851856

@@ -884,8 +889,13 @@ bool CRawFileIO::writeSample(const int32_t data, const unsigned int chl)
884889
{
885890
if (chl >= m_numChannels || m_eMode == eFileIoMode_input || m_pFramebuffer == nullptr || m_nBitsPerSample != 32)
886891
{
887-
LogDebug("bad params chl={}, m_numChannels={}, m_eMode={}, eFileIoMode_input={}", chl, m_numChannels,
888-
m_eMode, eFileIoMode_input);
892+
LogDebug
893+
(
894+
"bad param - chl={}, numChannels={}, eMode={}",
895+
chl,
896+
m_numChannels,
897+
(int) m_eMode
898+
);
889899
return false;
890900
}
891901

@@ -923,8 +933,12 @@ bool CRawFileIO::writeBlock(const void *pData, const unsigned int numFrames)
923933
{
924934
if (pData == nullptr || numFrames < 1 || m_eMode == eFileIoMode_input || m_pFramebuffer == nullptr)
925935
{
926-
LogDebug("bad params m_bFileOpened={}, m_eMode={}, eFileIoMode_input={}", m_bFileOpened, m_eMode,
927-
eFileIoMode_input);
936+
LogDebug
937+
(
938+
"bad param - bFileOpened={}, eMode={}",
939+
m_bFileOpened,
940+
(int) m_eMode
941+
);
928942
return false;
929943
}
930944

@@ -1582,7 +1596,11 @@ bool CWavFileIO::readBlock(void *pData, const unsigned int numFrames)
15821596

15831597
if (pData == nullptr || m_eMode == eFileIoMode_output)
15841598
{
1585-
LogDebug("bad params, m_eMode={}, eFileIoMode_input={}", m_eMode, eFileIoMode_input);
1599+
LogDebug
1600+
(
1601+
"bad param - eMode={}",
1602+
(int) m_eMode
1603+
);
15861604
return false;
15871605
}
15881606

@@ -1652,11 +1670,10 @@ bool CWavFileIO::writeSample(const int16_t data, const unsigned int chl)
16521670
{
16531671
LogDebug
16541672
(
1655-
"bad params chl={}, m_numChannels={}, m_eMode={}, eFileIoMode_input={}",
1673+
"bad param - chl={}, numChannels={}, eMode={}",
16561674
chl,
16571675
m_numChannels,
1658-
m_eMode,
1659-
eFileIoMode_input
1676+
(int) m_eMode
16601677
);
16611678

16621679
return false;
@@ -1709,8 +1726,13 @@ bool CWavFileIO::writeSample(const int32_t data, const unsigned int chl)
17091726
{
17101727
if (chl >= m_numChannels || m_eMode == eFileIoMode_input || m_nBitsPerSample != 32)
17111728
{
1712-
LogDebug("bad params chl={}, m_numChannels={}, m_eMode={}, eFileIoMode_input={}", chl, m_numChannels,
1713-
m_eMode, eFileIoMode_input);
1729+
LogDebug
1730+
(
1731+
"bad param - chl={}, numChannels={}, eMode={}",
1732+
chl,
1733+
m_numChannels,
1734+
(int) m_eMode
1735+
);
17141736
return false;
17151737
}
17161738

@@ -1973,25 +1995,64 @@ bool CWavFileIO::setCurrentFrame(unsigned int frameNum)
19731995

19741996
std::string removeLeadingSpaces(std::string& sStr)
19751997
{
1998+
std::string sOut = "";
1999+
2000+
bool bFirstCharFound = false;
2001+
2002+
// skip leading spaces
2003+
for (auto x = sStr.begin(); x != sStr.end(); x++)
2004+
{
2005+
if (bFirstCharFound == false && (*x) == ' ')
2006+
{
2007+
continue;
2008+
}
2009+
2010+
bFirstCharFound = true;
19762011

2012+
sOut.push_back((*x));
2013+
}
2014+
2015+
return sOut;
19772016
}
19782017

19792018

19802019
std::string removeTrailingSpaces(std::string& sStr)
19812020
{
2021+
std::string sOut = "";
2022+
2023+
int nLen = (int) sStr.size();
2024+
2025+
// find string len - num trailing spaces
2026+
for (auto x = (sStr.end() - 1); x != sStr.begin(); x--)
2027+
{
2028+
if ((*x) != ' ')
2029+
{
2030+
break;
2031+
}
2032+
2033+
nLen--;
2034+
}
2035+
2036+
sOut.append(sStr.substr(0, nLen));
2037+
2038+
return sOut;
19822039

19832040
}
19842041

19852042

19862043
std::string getFileExt(std::string& sPath)
19872044
{
2045+
std::filesystem::path filePath(sPath);
19882046

2047+
return (filePath.extension().string());
19892048
}
19902049

19912050

19922051
std::string getFileName(std::string& sPath)
19932052
{
2053+
std::filesystem::path filePath(sPath);
19942054

2055+
return (filePath.filename().string());
19952056
}
19962057

19972058

‎Src/FileIO/CFileIO.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
enum eFileIoMode_def
1919
{
20-
eFileIoMode_unknown = -1,
20+
eFileIoMode_unknown = 0,
2121
eFileIoMode_input,
2222
eFileIoMode_output,
2323
eFileIoMode_IO,

‎Src/Logging/Logging.h

+28-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ enum eLogLevel
4545

4646
class CLogger
4747
{
48-
std::string m_sLogFilename;
48+
std::string m_sLogName;
49+
std::string m_sLogFile;
4950

5051
eLogLevel m_nLogLevel;
5152

@@ -54,26 +55,46 @@ class CLogger
5455

5556
public:
5657

57-
CLogger(std::string logFile, eLogLevel logLevel = LogLevel_error) :
58-
m_sLogFilename(logFile),
58+
CLogger(std::string logFile = "", eLogLevel logLevel = LogLevel_error) :
59+
m_sLogFile(logFile),
5960
m_nLogLevel(logLevel)
6061
{
62+
m_sLogName.clear();
63+
6164
m_nMaxLogFileSize = 0; // default
6265
m_nMaxNumLogFiles = 0; // default
6366
}
6467

65-
void Init()
68+
void Init(const std::string &sLogName, const std::string &sFile)
6669
{
70+
m_sLogName = sLogName;
71+
m_sLogFile = sFile;
72+
6773
#ifdef USE_SPDLOG
6874

69-
auto spdlogLevel = ((int) spdlog::level::off - (int) m_nLogLevel);
70-
71-
spdlog::set_level((spdlog::level::level_enum) spdlogLevel);
7275

7376
#else
7477

7578
plog::init((plog::Severity) m_nLogLevel, (const char *) m_sLogFilename.c_str(), (size_t) m_nMaxLogFileSize, (int) m_nMaxNumLogFiles);
7679

80+
#endif
81+
}
82+
83+
void Init(const std::string& sLogName, const std::string& sFile, eLogLevel logLevel)
84+
{
85+
m_sLogName = sLogName;
86+
m_sLogFile = sFile;
87+
88+
#ifdef USE_SPDLOG
89+
90+
auto spdlogLevel = ((int)spdlog::level::off - (int)m_nLogLevel);
91+
92+
spdlog::set_level((spdlog::level::level_enum)spdlogLevel);
93+
94+
#else
95+
96+
plog::init((plog::Severity)m_nLogLevel, (const char*)m_sLogFilename.c_str(), (size_t)m_nMaxLogFileSize, (int)m_nMaxNumLogFiles);
97+
7798
#endif
7899
}
79100

‎Src/PlugIn/CPluginClassInstMgr.h

+8-11
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
#include "../Error/CError.h"
2020

2121

22-
/// All plugins should include the definition of a class derrived from this class
2322

24-
template <typename T> class CPluginClassInstMgrBase
23+
template <typename T>
24+
class CPluginClassMgrBase
2525
{
26+
friend class CAudioPluginClassMgrBase;
27+
friend class CCmdPluginClassMgrBase;
28+
2629
protected:
2730

2831
std::string m_sPluginModuleName;
@@ -33,12 +36,12 @@ template <typename T> class CPluginClassInstMgrBase
3336

3437
public:
3538

36-
CPluginClassInstMgrBase()
39+
CPluginClassMgrBase()
3740
{
3841
clear();
3942
}
4043

41-
~CPluginClassInstMgrBase()
44+
~CPluginClassMgrBase()
4245
{
4346
clear();
4447
}
@@ -65,16 +68,10 @@ template <typename T> class CPluginClassInstMgrBase
6568
return m_nPluginType;
6669
}
6770

68-
std::shared_ptr<T> CreatePluginClassInstance()
69-
{
70-
auto pPluginInterface = std::make_shared<T>();
71-
72-
return pPluginInterface;
73-
}
71+
virtual std::shared_ptr<T> CreatePluginClassInstance() = 0;
7472

7573
};
7674

7775

7876

79-
8077
#endif // _PLUGIN_CLASS_INST_MANAGER_H

0 commit comments

Comments
 (0)