summaryrefslogtreecommitdiff
path: root/src/lib/audio_analysis.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-08 23:02:35 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-08 23:02:35 +0100
commit12efbd5938f08eb445b43f539fa4f27aa5caccfb (patch)
treeff931f920b30ad187942206268d9f18b3f06448d /src/lib/audio_analysis.cc
parent630a56ad9e7ecfb42b1d761098820f9e492f9c4e (diff)
parent0ae086a90ef262fed4e265df197fd62fcdfbccf7 (diff)
Merge master.
Diffstat (limited to 'src/lib/audio_analysis.cc')
-rw-r--r--src/lib/audio_analysis.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 46477950c..9f92bdb50 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -44,7 +44,10 @@ AudioPoint::AudioPoint ()
AudioPoint::AudioPoint (FILE* f)
{
for (int i = 0; i < COUNT; ++i) {
- fscanf (f, "%f", &_data[i]);
+ int n = fscanf (f, "%f", &_data[i]);
+ if (n != 1) {
+ _data[i] = 0;
+ }
}
}
@@ -87,7 +90,7 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
{
FILE* f = fopen_boost (filename, "r");
- int channels;
+ int channels = 0;
fscanf (f, "%d", &channels);
_data.resize (channels);