Mercurial > hg > svcore
view data/fileio/DataFileReaderFactory.cpp @ 1310:aa1b1fc2d018 mp3-gapless
Stop reporting sync errors only when we really are at eof, i.e. after the input callback has been called again (previously we just tested whether we'd buffered up all the input, which of course we do in one go at the start)
author | Chris Cannam |
---|---|
date | Tue, 29 Nov 2016 16:45:29 +0000 |
parents | 26cf6d5251ec |
children | 1dc64d3d323c |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2006 Chris Cannam. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "DataFileReaderFactory.h" #include "MIDIFileReader.h" #include "CSVFileReader.h" #include "model/Model.h" #include <QString> QString DataFileReaderFactory::getKnownExtensions() { return "*.svl *.csv *.lab *.mid *.txt"; } DataFileReader * DataFileReaderFactory::createReader(QString path, bool csv, MIDIFileImportPreferenceAcquirer *acquirer, CSVFormat format, sv_samplerate_t mainModelSampleRate) { QString err; DataFileReader *reader = 0; if (!csv) { reader = new MIDIFileReader(path, acquirer, mainModelSampleRate); if (reader->isOK()) return reader; if (reader->getError() != "") err = reader->getError(); delete reader; } if (csv) { reader = new CSVFileReader(path, format, mainModelSampleRate); if (reader->isOK()) return reader; if (reader->getError() != "") err = reader->getError(); delete reader; } return 0; } DataFileReader * DataFileReaderFactory::createReader(QString path, MIDIFileImportPreferenceAcquirer *acquirer, sv_samplerate_t mainModelSampleRate) { DataFileReader *reader = createReader (path, false, acquirer, CSVFormat(), mainModelSampleRate); if (reader) return reader; reader = createReader (path, true, acquirer, CSVFormat(path), mainModelSampleRate); if (reader) return reader; return 0; } Model * DataFileReaderFactory::load(QString path, MIDIFileImportPreferenceAcquirer *acquirer, sv_samplerate_t mainModelSampleRate) { DataFileReader *reader = createReader(path, acquirer, mainModelSampleRate); if (!reader) return NULL; try { Model *model = reader->load(); delete reader; return model; } catch (Exception) { delete reader; throw; } } Model * DataFileReaderFactory::loadNonCSV(QString path, MIDIFileImportPreferenceAcquirer *acquirer, sv_samplerate_t mainModelSampleRate) { DataFileReader *reader = createReader(path, false, acquirer, CSVFormat(), mainModelSampleRate); if (!reader) return NULL; try { Model *model = reader->load(); delete reader; return model; } catch (Exception) { delete reader; throw; } } Model * DataFileReaderFactory::loadCSV(QString path, CSVFormat format, sv_samplerate_t mainModelSampleRate) { DataFileReader *reader = createReader(path, true, 0, format, mainModelSampleRate); if (!reader) return NULL; try { Model *model = reader->load(); delete reader; return model; } catch (Exception) { delete reader; throw; } }