Mercurial > hg > sonic-visualiser
comparison document/SVFileReader.cpp @ 198:24ac2e4010c5
* RemoteFile -> FileSource
now it's used all over the place for local files as well.
author | Chris Cannam |
---|---|
date | Thu, 18 Oct 2007 16:20:26 +0000 |
parents | c08c312b2399 |
children |
comparison
equal
deleted
inserted
replaced
197:c08c312b2399 | 198:24ac2e4010c5 |
---|---|
20 #include "base/PlayParameters.h" | 20 #include "base/PlayParameters.h" |
21 #include "base/PlayParameterRepository.h" | 21 #include "base/PlayParameterRepository.h" |
22 | 22 |
23 #include "data/fileio/AudioFileReaderFactory.h" | 23 #include "data/fileio/AudioFileReaderFactory.h" |
24 #include "data/fileio/FileFinder.h" | 24 #include "data/fileio/FileFinder.h" |
25 #include "data/fileio/RemoteFile.h" | 25 #include "data/fileio/FileSource.h" |
26 | 26 |
27 #include "data/model/WaveFileModel.h" | 27 #include "data/model/WaveFileModel.h" |
28 #include "data/model/EditableDenseThreeDimensionalModel.h" | 28 #include "data/model/EditableDenseThreeDimensionalModel.h" |
29 #include "data/model/SparseOneDimensionalModel.h" | 29 #include "data/model/SparseOneDimensionalModel.h" |
30 #include "data/model/SparseTimeValueModel.h" | 30 #include "data/model/SparseTimeValueModel.h" |
411 FileFinder *ff = FileFinder::getInstance(); | 411 FileFinder *ff = FileFinder::getInstance(); |
412 QString originalPath = attributes.value("file"); | 412 QString originalPath = attributes.value("file"); |
413 QString path = ff->find(FileFinder::AudioFile, | 413 QString path = ff->find(FileFinder::AudioFile, |
414 originalPath, m_location); | 414 originalPath, m_location); |
415 | 415 |
416 RemoteFile file(path); | 416 FileSource file(path); |
417 file.waitForStatus(); | 417 file.waitForStatus(); |
418 | 418 |
419 if (!file.isOK()) { | 419 if (!file.isOK()) { |
420 std::cerr << "SVFileReader::readModel: Failed to retrieve file \"" << path.toStdString() << "\" for wave file model: " << file.getErrorString().toStdString() << std::endl; | 420 std::cerr << "SVFileReader::readModel: Failed to retrieve file \"" << path.toStdString() << "\" for wave file model: " << file.getErrorString().toStdString() << std::endl; |
421 } else if (!file.isAvailable()) { | 421 } else if (!file.isAvailable()) { |