- cleanup

This commit is contained in:
2020-10-29 10:09:58 +02:00
parent 5450c155d9
commit 6554688cb7
8 changed files with 24 additions and 11 deletions

View File

@@ -38,7 +38,7 @@ class AudioManager: public Audio::Player::EndOfAudioDelegate
{
public:
AudioManager();
~AudioManager();
virtual ~AudioManager();
static AudioManager& instance();

View File

@@ -98,6 +98,10 @@ unsigned TimeSource::time()
#if defined(TARGET_LINUX)
assert(0);
#endif
#if defined(TARGET_ANDROID)
assert(0);
#endif
}
// --- StubTimer ---

View File

@@ -237,8 +237,8 @@ std::pair<std::string, std::string> StringHelper::parseAssignment(const std::str
result.second = StringHelper::trim(s.substr(p+1));
if (trimQuotes && result.second.size() >= 2)
{
if (result.second[0] == '"' && result.second[result.second.size()-1] == '"' ||
result.second[0] == '\'' && result.second[result.second.size()-1] == '\'')
if ((result.second[0] == '"' && result.second[result.second.size()-1] == '"') ||
(result.second[0] == '\'' && result.second[result.second.size()-1] == '\''))
result.second = result.second.substr(1, result.second.size() - 2);
}
}

View File

@@ -41,6 +41,8 @@ long SyncHelper::increment(long *value)
return OSAtomicIncrement32((int32_t*)value);
#elif TARGET_LINUX
return -1;
#else
return -1;
#endif
}
@@ -66,6 +68,11 @@ uint64_t ThreadHelper::getCurrentId()
// RPi builds want this!
return (uint64_t)(pthread_self());
#endif
#if defined(TARGET_ANDROID)
return (uint64_t)(pthread_self());
#endif
return 0;
}
// ------------------- TimeHelper ---------------
using namespace std::chrono;

View File

@@ -71,4 +71,6 @@ bool Uuid::operator < (const Uuid& right) const
#if defined(TARGET_WIN)
return memcmp(&mUuid, &right.mUuid, sizeof(mUuid)) < 0;
#endif
return false;
}

View File

@@ -21,7 +21,7 @@ namespace MT
{
public:
Terminal(const CodecList::Settings& codecSettings);
~Terminal();
virtual ~Terminal();
CodecList& codeclist();