summaryrefslogtreecommitdiff
path: root/orkbasecxx
diff options
context:
space:
mode:
Diffstat (limited to 'orkbasecxx')
-rw-r--r--orkbasecxx/AudioCapture.cpp1
-rw-r--r--orkbasecxx/BatchProcessing.cpp2
-rw-r--r--orkbasecxx/ConfigManager.cpp8
-rw-r--r--orkbasecxx/LogManager.cpp8
-rw-r--r--orkbasecxx/MemUtils.cpp2
-rw-r--r--orkbasecxx/MultiThreadedServer.cpp1
-rw-r--r--orkbasecxx/Utils.cpp2
-rw-r--r--orkbasecxx/audiofile/AudioFile.h2
-rw-r--r--orkbasecxx/audiofile/MediaChunkFile.cpp6
-rw-r--r--orkbasecxx/audiofile/PcmFile.cpp2
-rw-r--r--orkbasecxx/serializers/Serializer.cpp10
-rw-r--r--orkbasecxx/serializers/SingleLineSerializer.cpp6
-rw-r--r--orkbasecxx/serializers/UrlSerializer.cpp6
13 files changed, 26 insertions, 30 deletions
diff --git a/orkbasecxx/AudioCapture.cpp b/orkbasecxx/AudioCapture.cpp
index 77b9e95..1cb5ca6 100644
--- a/orkbasecxx/AudioCapture.cpp
+++ b/orkbasecxx/AudioCapture.cpp
@@ -207,7 +207,6 @@ int AudioChunk::GetNumSamples()
double AudioChunk::GetDurationSec()
{
- int i = 0;
return ((double)GetNumSamples())/((double)m_details.m_sampleRate);
}
diff --git a/orkbasecxx/BatchProcessing.cpp b/orkbasecxx/BatchProcessing.cpp
index 560ac3e..81746af 100644
--- a/orkbasecxx/BatchProcessing.cpp
+++ b/orkbasecxx/BatchProcessing.cpp
@@ -320,7 +320,7 @@ void BatchProcessing::ThreadHandler(void *args)
if(CONFIG.m_transcodingSleepEveryNumFrames > 0 && CONFIG.m_transcodingSleepUs > 0)
{
- if(frameSleepCounter >= CONFIG.m_transcodingSleepEveryNumFrames)
+ if(frameSleepCounter >= (unsigned int)CONFIG.m_transcodingSleepEveryNumFrames)
{
frameSleepCounter = 0;
struct timespec ts;
diff --git a/orkbasecxx/ConfigManager.cpp b/orkbasecxx/ConfigManager.cpp
index 85ad41e..1dff7d8 100644
--- a/orkbasecxx/ConfigManager.cpp
+++ b/orkbasecxx/ConfigManager.cpp
@@ -48,7 +48,7 @@ void ConfigManager::Initialize()
try
{
- char* cfgFilename = "";
+ char* cfgFilename = NULL;
char* cfgEnvPath = "";
int cfgAlloc = 0;
@@ -69,19 +69,19 @@ void ConfigManager::Initialize()
}
}
- if(!cfgFilename || !strlen(cfgFilename)) {
+ if(!cfgFilename) {
FILE* file = ACE_OS::fopen(CONFIG_FILE_NAME, "r");
if(file)
{
// config.xml exists in the current directory
- cfgFilename = CONFIG_FILE_NAME;
+ cfgFilename = (char*)CONFIG_FILE_NAME;
fclose(file);
}
else
{
// config.xml could not be found in the current
// directory, try to find it in system configuration directory
- cfgFilename = ETC_CONFIG_FILE_NAME;
+ cfgFilename = (char*)ETC_CONFIG_FILE_NAME;
}
}
diff --git a/orkbasecxx/LogManager.cpp b/orkbasecxx/LogManager.cpp
index 6259a70..f058429 100644
--- a/orkbasecxx/LogManager.cpp
+++ b/orkbasecxx/LogManager.cpp
@@ -30,7 +30,7 @@ void OrkLogManager::Initialize()
{
BasicConfigurator::configure();
- char* logCfgFilename = "";
+ char* logCfgFilename = NULL;
char* cfgEnvPath = "";
int cfgAlloc = 0;
@@ -51,19 +51,19 @@ void OrkLogManager::Initialize()
}
}
- if(!logCfgFilename || !strlen(logCfgFilename)) {
+ if(!logCfgFilename) {
FILE* file = ACE_OS::fopen("logging.properties", "r");
if(file)
{
// logging.properties exists in the current directory
- logCfgFilename = "logging.properties";
+ logCfgFilename = (char*)"logging.properties";
fclose(file);
}
else
{
// logging.properties could not be found in the current
// directory, try to find it in system configuration directory
- logCfgFilename = "/etc/orkaudio/logging.properties";
+ logCfgFilename = (char*)"/etc/orkaudio/logging.properties";
}
}
diff --git a/orkbasecxx/MemUtils.cpp b/orkbasecxx/MemUtils.cpp
index 5fd8994..6b7740e 100644
--- a/orkbasecxx/MemUtils.cpp
+++ b/orkbasecxx/MemUtils.cpp
@@ -22,7 +22,7 @@
void MemToHex(unsigned char* input, size_t len, CStdString&output)
{
char byteAsHex[10];
- for(int i=0; i<len; i++)
+ for(unsigned int i=0; i<len; i++)
{
sprintf(byteAsHex, "%.2x", input[i]);
output += byteAsHex;
diff --git a/orkbasecxx/MultiThreadedServer.cpp b/orkbasecxx/MultiThreadedServer.cpp
index 7be1a1e..485b560 100644
--- a/orkbasecxx/MultiThreadedServer.cpp
+++ b/orkbasecxx/MultiThreadedServer.cpp
@@ -320,7 +320,6 @@ int EventStreamingServer::svc(void)
peer().send(header, header.GetLength());
time_t startTime = time(NULL);
- time_t lastSentTime = time(NULL);
sessionId = EventStreamingSingleton::instance()->GetNewSessionId() + " -";
logMsg.Format("%s Event streaming start", sessionId);
diff --git a/orkbasecxx/Utils.cpp b/orkbasecxx/Utils.cpp
index f06d673..656a3ce 100644
--- a/orkbasecxx/Utils.cpp
+++ b/orkbasecxx/Utils.cpp
@@ -234,7 +234,7 @@ void FileEscapeName(CStdString& in, CStdString& out)
// Translates all the characters that are not in file_ok_chars string into %xx sequences
// %xx specifies the character ascii code in hexadecimal
out = "";
- for (int i = 0 ; i<in.size() ; i++)
+ for (unsigned int i = 0 ; i<in.size() ; i++)
{
if (strchr(file_ok_chars, in.GetAt(i)))
{
diff --git a/orkbasecxx/audiofile/AudioFile.h b/orkbasecxx/audiofile/AudioFile.h
index cc37e4c..ce54385 100644
--- a/orkbasecxx/audiofile/AudioFile.h
+++ b/orkbasecxx/audiofile/AudioFile.h
@@ -41,7 +41,7 @@ public:
/** Writes a chunk of audio to disk.
If stereo capture, this represents the local party */
virtual void WriteChunk(AudioChunkRef chunkRef) = 0;
- /** Writes a chunk of audio from the remote pary to disk (if stereo capture)
+ /** Writes a chunk of audio from the remote pary to disk (if stereo capture) */
//virtual bool WriteRemoteChunk(AudioChunkRef chunkRef) = 0;
/** Reads a chunk of audio stereo-wise
If underlying storage is mono, remoteChunk will be NULL
diff --git a/orkbasecxx/audiofile/MediaChunkFile.cpp b/orkbasecxx/audiofile/MediaChunkFile.cpp
index 3856be5..1e9d6a3 100644
--- a/orkbasecxx/audiofile/MediaChunkFile.cpp
+++ b/orkbasecxx/audiofile/MediaChunkFile.cpp
@@ -61,8 +61,7 @@ bool MediaChunkFile::FlushToDisk()
continue;
}
- int tmp = sizeof(AudioChunkDetails);
- unsigned int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream);
+ int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream);
if(numWritten != 1)
{
writeError = true;
@@ -97,7 +96,7 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef)
m_chunkQueueDataSize += pChunk->GetNumBytes();
m_chunkQueue.push(chunkRef);
- if(m_chunkQueueDataSize > (CONFIG.m_captureFileBatchSizeKByte*1024))
+ if(m_chunkQueueDataSize > (unsigned int)(CONFIG.m_captureFileBatchSizeKByte*1024))
{
if (m_stream)
{
@@ -117,7 +116,6 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef)
int MediaChunkFile::ReadChunkMono(AudioChunkRef& chunkRef)
{
unsigned int numRead = 0;
- bool readError = false;
if (m_stream)
{
diff --git a/orkbasecxx/audiofile/PcmFile.cpp b/orkbasecxx/audiofile/PcmFile.cpp
index 85f49e3..c6ba65c 100644
--- a/orkbasecxx/audiofile/PcmFile.cpp
+++ b/orkbasecxx/audiofile/PcmFile.cpp
@@ -59,7 +59,7 @@ void PcmFile::WriteChunk(AudioChunkRef chunkRef)
throw(CStdString("Write attempt on unopened file:")+ m_filename);
}
- if (numWritten != chunkRef->GetNumSamples())
+ if (numWritten != (unsigned int)chunkRef->GetNumSamples())
{
throw(CStdString("Could not write to file:")+ m_filename);
}
diff --git a/orkbasecxx/serializers/Serializer.cpp b/orkbasecxx/serializers/Serializer.cpp
index 3318833..df066b0 100644
--- a/orkbasecxx/serializers/Serializer.cpp
+++ b/orkbasecxx/serializers/Serializer.cpp
@@ -318,7 +318,7 @@ void Serializer::GetCsv(const char* key, std::list<CStdString>& value, bool req
CStdString element;
bool first = true;
GetString(key, stringValue, required);
- for(int i=0; i<stringValue.length(); i++)
+ for(unsigned int i=0; i<stringValue.length(); i++)
{
TCHAR c = stringValue[i];
if(c == ',')
@@ -404,7 +404,7 @@ void Serializer::GetIpRanges(const char* key, IpRanges& value, bool required)
// Escape the comma and percent characters for adding string to csv list
void Serializer::EscapeCsv(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ',')
@@ -425,7 +425,7 @@ void Serializer::EscapeCsv(CStdString& in, CStdString& out)
// Unescape the comma and percent characters when retrieving from csv list
void Serializer::UnEscapeCsv(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
@@ -455,7 +455,7 @@ void Serializer::UnEscapeCsv(CStdString& in, CStdString& out)
// Escape the colon and percent characters for adding string to a pair of the form "key:value"
void Serializer::EscapePair(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ':')
@@ -476,7 +476,7 @@ void Serializer::EscapePair(CStdString& in, CStdString& out)
// UnEscape the colon and percent characters after retrieving a key or value from a pair of the form "key:value"
void Serializer::UnEscapePair(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
diff --git a/orkbasecxx/serializers/SingleLineSerializer.cpp b/orkbasecxx/serializers/SingleLineSerializer.cpp
index 807f572..f60156d 100644
--- a/orkbasecxx/serializers/SingleLineSerializer.cpp
+++ b/orkbasecxx/serializers/SingleLineSerializer.cpp
@@ -45,7 +45,7 @@ void SingleLineSerializer::DeSerialize(CStdString& input)
input.Trim();
- for(int i=0; i<input.length() && state!= SingleLineErrorState; i++)
+ for(unsigned int i=0; i<input.length() && state!= SingleLineErrorState; i++)
{
TCHAR character = input[i];
@@ -125,7 +125,7 @@ void SingleLineSerializer::DeSerialize(CStdString& input)
// Escape the space, equals and percent characters for serializing to Key-Value-Pair text
void SingleLineSerializer::EscapeSingleLine(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ' ')
@@ -150,7 +150,7 @@ void SingleLineSerializer::EscapeSingleLine(CStdString& in, CStdString& out)
// Unescape the space, equals and percent characters for serializing to Key-Value-Pair text
void SingleLineSerializer::UnEscapeSingleLine(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
diff --git a/orkbasecxx/serializers/UrlSerializer.cpp b/orkbasecxx/serializers/UrlSerializer.cpp
index b80024a..6cabccd 100644
--- a/orkbasecxx/serializers/UrlSerializer.cpp
+++ b/orkbasecxx/serializers/UrlSerializer.cpp
@@ -48,7 +48,7 @@ void UrlSerializer::DeSerialize(CStdString& input)
input.Trim();
- for(int i=0; i<input.length() && state!= UrlErrorState; i++)
+ for(unsigned int i=0; i<input.length() && state!= UrlErrorState; i++)
{
TCHAR character = input[i];
@@ -130,7 +130,7 @@ void UrlSerializer::EscapeUrl(CStdString& in, CStdString& out)
// Translates all the characters that are not in url_ok_chars string into %xx sequences
// %xx specifies the character ascii code in hexadecimal
out = "";
- for (int i = 0 ; i<in.size() ; i++)
+ for (unsigned int i = 0 ; i<in.size() ; i++)
{
if (in.GetAt(i) == ' ')
out += '+';
@@ -150,7 +150,7 @@ void UrlSerializer::UnEscapeUrl(CStdString& in, CStdString& out)
// Translates all %xx escaped sequences to corresponding ascii characters
out = "";
char pchHex[3];
- for (int i = 0; i<in.size(); i++)
+ for (unsigned int i = 0; i<in.size(); i++)
{
switch (in.GetAt(i))
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 00:52:43 +0000