Version 0.9.1
Fixed: When a completely empty (0-byte) configuration file was being read, the reading process got into an endless loop.
This commit is contained in:
1 parent
32fd256d38
commit
eb80e59bff
3 files changed
+2
-11
No files matched your search
+1
-9
@@ -60,7 +60,6 @@ FilterEngine::FilterEngine()
|
|||||||
capture = false;
|
capture = false;
|
||||||
inputChannelCount = 0;
|
inputChannelCount = 0;
|
||||||
lastInputWasSilent = false;
|
lastInputWasSilent = false;
|
||||||
lastInputSize = -1;
|
|
||||||
threadHandle = NULL;
|
threadHandle = NULL;
|
||||||
currentConfig = NULL;
|
currentConfig = NULL;
|
||||||
nextConfig = NULL;
|
nextConfig = NULL;
|
||||||
@@ -353,7 +352,7 @@ void FilterEngine::loadConfig(const wstring& path)
|
|||||||
addFilters(newFilters);
|
addFilters(newFilters);
|
||||||
}
|
}
|
||||||
|
|
||||||
while(!inputStream.eof())
|
while(inputStream.good())
|
||||||
{
|
{
|
||||||
string encodedLine;
|
string encodedLine;
|
||||||
getline(inputStream, encodedLine);
|
getline(inputStream, encodedLine);
|
||||||
@@ -420,13 +419,6 @@ void FilterEngine::process(float *output, float *input, unsigned frameCount)
|
|||||||
{
|
{
|
||||||
bool inputSilent = true;
|
bool inputSilent = true;
|
||||||
|
|
||||||
if(lastInputSize != frameCount)
|
|
||||||
{
|
|
||||||
if(lastInputSize != -1)
|
|
||||||
LogF(L"Input size changed from %d to %d", lastInputSize, frameCount);
|
|
||||||
lastInputSize = frameCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (unsigned i = 0; i < frameCount * realChannelCount; i++)
|
for (unsigned i = 0; i < frameCount * realChannelCount; i++)
|
||||||
{
|
{
|
||||||
if(input[i] != 0)
|
if(input[i] != 0)
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ private:
|
|||||||
void* shutdownEvent;
|
void* shutdownEvent;
|
||||||
stdext::hash_set<std::wstring> watchRegistryKeys;
|
stdext::hash_set<std::wstring> watchRegistryKeys;
|
||||||
bool lastInputWasSilent;
|
bool lastInputWasSilent;
|
||||||
unsigned lastInputSize;
|
|
||||||
stdext::hash_map<std::wstring, int> channelNameToPosMap;
|
stdext::hash_map<std::wstring, int> channelNameToPosMap;
|
||||||
stdext::hash_map<int, std::wstring> channelPosToNameMap;
|
stdext::hash_map<int, std::wstring> channelPosToNameMap;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user