Mercurial > hg > svcore
diff data/model/WaveFileModel.cpp @ 290:92e8dbde73cd
* Revert revision 713. We do like QStrings after all.
author | Chris Cannam |
---|---|
date | Fri, 24 Aug 2007 11:41:48 +0000 |
parents | 7b96b3bd4bae |
children | 8c5762634f42 |
line wrap: on
line diff
--- a/data/model/WaveFileModel.cpp Thu Aug 16 16:47:07 2007 +0000 +++ b/data/model/WaveFileModel.cpp Fri Aug 24 11:41:48 2007 +0000 @@ -46,8 +46,8 @@ 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(); } @@ -60,8 +60,8 @@ 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(); } @@ -75,7 +75,7 @@ m_exiting(false) { m_reader = reader; - setObjectName(m_reader->getTitle().c_str()); + setObjectName(m_reader->getTitle()); if (objectName() == "") setObjectName(QFileInfo(path).fileName()); fillCache(); } @@ -171,7 +171,7 @@ // << start << ", " << end << "): calling reader" << std::endl; #endif - AudioFileReader::SampleBlock frames; + SampleBlock frames; m_reader->getInterleavedFrames(start, end - start, frames); size_t i = 0; @@ -213,7 +213,7 @@ if (!m_reader || !m_reader->isOK()) return 0; - AudioFileReader::SampleBlock frames; + SampleBlock frames; m_reader->getInterleavedFrames(start, end - start, frames); size_t i = 0; @@ -272,7 +272,7 @@ // 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; @@ -478,7 +478,7 @@ size_t frame = 0; size_t readBlockSize = 16384; - AudioFileReader::SampleBlock block; + SampleBlock block; if (!m_model.isOK()) return;