Skip to content

Commit

Permalink
Version 0.9.1
Browse files Browse the repository at this point in the history
Fixed: When a completely empty (0-byte) configuration file was being read, the reading process got into an endless loop.

git-svn-id: svn://svn.code.sf.net/p/equalizerapo/code/trunk@37 177c5db2-39f6-4273-851a-b0754c4d5937
  • Loading branch information
jthedering committed Sep 2, 2014
1 parent 468802e commit ea4b280
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
10 changes: 1 addition & 9 deletions FilterEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ FilterEngine::FilterEngine()
capture = false;
inputChannelCount = 0;
lastInputWasSilent = false;
lastInputSize = -1;
threadHandle = NULL;
currentConfig = NULL;
nextConfig = NULL;
Expand Down Expand Up @@ -353,7 +352,7 @@ void FilterEngine::loadConfig(const wstring& path)
addFilters(newFilters);
}

while(!inputStream.eof())
while(inputStream.good())
{
string encodedLine;
getline(inputStream, encodedLine);
Expand Down Expand Up @@ -420,13 +419,6 @@ void FilterEngine::process(float *output, float *input, unsigned frameCount)
{
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++)
{
if(input[i] != 0)
Expand Down
1 change: 0 additions & 1 deletion FilterEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ class FilterEngine
void* shutdownEvent;
stdext::hash_set<std::wstring> watchRegistryKeys;
bool lastInputWasSilent;
unsigned lastInputSize;
stdext::hash_map<std::wstring, int> channelNameToPosMap;
stdext::hash_map<int, std::wstring> channelPosToNameMap;
};
Expand Down
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define MAJOR 0
#define MINOR 9
#define REVISION 0
#define REVISION 1

0 comments on commit ea4b280

Please sign in to comment.