comparison data/model/WaveFileModel.cpp @ 290:92e8dbde73cd

* Revert revision 713.  We do like QStrings after all.

     m_fillThread(0),
     m_updateTimer(0),
     m_lastFillExtent(0),
     m_exiting(false)
 {
-    m_reader = AudioFileReaderFactory::createReader(path.toStdString());
-    setObjectName(m_reader->getTitle().c_str());
+    m_reader = AudioFileReaderFactory::createReader(path);
+    setObjectName(m_reader->getTitle());
     if (objectName() == "") setObjectName(QFileInfo(path).fileName());
     if (isOK()) fillCache();
 }
 
 WaveFileModel::WaveFileModel(QString path, QString originalLocation) :

     m_fillThread(0),
     m_updateTimer(0),
     m_lastFillExtent(0),
     m_exiting(false)
 {
-    m_reader = AudioFileReaderFactory::createReader(path.toStdString());
-    setObjectName(m_reader->getTitle().c_str());
+    m_reader = AudioFileReaderFactory::createReader(path);
+    setObjectName(m_reader->getTitle());
     if (objectName() == "") setObjectName(QFileInfo(originalLocation).fileName());
     if (isOK()) fillCache();
 }
 
 WaveFileModel::WaveFileModel(QString path, AudioFileReader *reader) :

     m_updateTimer(0),
     m_lastFillExtent(0),
     m_exiting(false)
 {
     m_reader = reader;
-    setObjectName(m_reader->getTitle().c_str());
+    setObjectName(m_reader->getTitle());
     if (objectName() == "") setObjectName(QFileInfo(path).fileName());
     fillCache();
 }
 
 WaveFileModel::~WaveFileModel()

 #ifdef DEBUG_WAVE_FILE_MODEL
 //    std::cerr << "WaveFileModel::getValues(" << channel << ", "
 //              << start << ", " << end << "): calling reader" << std::endl;
 #endif
 
-    AudioFileReader::SampleBlock frames;
+    SampleBlock frames;
     m_reader->getInterleavedFrames(start, end - start, frames);
 
     size_t i = 0;
 
     int ch0 = channel, ch1 = channel, channels = getChannelCount();

 	assert(end >= start);
     }
 
     if (!m_reader || !m_reader->isOK()) return 0;
 
-    AudioFileReader::SampleBlock frames;
+    SampleBlock frames;
     m_reader->getInterleavedFrames(start, end - start, frames);
 
     size_t i = 0;
 
     int ch0 = channel, ch1 = channel, channels = getChannelCount();

 	// for stereo files, in two separate calls to this method.
 	// We could fairly trivially handle this for most cases that
 	// matter by putting a single cache in getInterleavedFrames
 	// for short queries.
 
-        AudioFileReader::SampleBlock frames;
+	SampleBlock frames;
 	m_reader->getInterleavedFrames(start, end - start, frames);
 	float max = 0.0, min = 0.0, total = 0.0;
 	size_t i = 0, count = 0;
 
 	while (i < end - start) {

     cacheBlockSize[1] = ((unsigned int)((1 << m_model.m_zoomConstraint.getMinCachePower()) *
                                         sqrt(2) + 0.01));
     
     size_t frame = 0;
     size_t readBlockSize = 16384;
-    AudioFileReader::SampleBlock block;
+    SampleBlock block;
 
     if (!m_model.isOK()) return;
     
     size_t channels = m_model.getChannelCount();
     bool updating = m_model.m_reader->isUpdating();