diff data/model/WaveFileModel.cpp @ 980:6e6da0636e5e tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 9869ea3a93b7
children 36f79bc5c3d7
line wrap: on
line diff
--- a/data/model/WaveFileModel.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/data/model/WaveFileModel.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -40,6 +40,7 @@
 WaveFileModel::WaveFileModel(FileSource source, int targetRate) :
     m_source(source),
     m_path(source.getLocation()),
+    m_reader(0),
     m_myReader(true),
     m_startFrame(0),
     m_fillThread(0),
@@ -67,6 +68,7 @@
 WaveFileModel::WaveFileModel(FileSource source, AudioFileReader *reader) :
     m_source(source),
     m_path(source.getLocation()),
+    m_reader(0),
     m_myReader(false),
     m_startFrame(0),
     m_fillThread(0),