Mercurial > hg > svcore
changeset 930:06579b8ffb7b warnfix_no_size_t
More size_t evisceration and warning fixes
| author | Chris Cannam |
|---|---|
| date | Tue, 17 Jun 2014 14:49:49 +0100 |
| parents | 59e7fe1b1003 |
| children | df82da55e86a |
| files | data/model/FlexiNoteModel.h data/model/SparseModel.h rdf/RDFFeatureWriter.cpp rdf/RDFFeatureWriter.h rdf/RDFImporter.cpp rdf/RDFTransformFactory.cpp transform/CSVFeatureWriter.cpp transform/FeatureExtractionModelTransformer.cpp transform/FeatureExtractionModelTransformer.h transform/FeatureWriter.h transform/FileFeatureWriter.h transform/ModelTransformerFactory.cpp transform/ModelTransformerFactory.h transform/RealTimeEffectModelTransformer.cpp transform/Transform.cpp transform/Transform.h transform/TransformFactory.cpp transform/TransformFactory.h |
| diffstat | 18 files changed, 96 insertions(+), 102 deletions(-) [+] |
line wrap: on
line diff
--- a/data/model/FlexiNoteModel.h Tue Jun 17 14:33:42 2014 +0100 +++ b/data/model/FlexiNoteModel.h Tue Jun 17 14:49:49 2014 +0100 @@ -228,10 +228,10 @@ NoteList getNotes() const { - return getNotes(getStartFrame(), getEndFrame()); + return getNotesWithin(getStartFrame(), getEndFrame()); } - NoteList getNotes(int startFrame, int endFrame) const + NoteList getNotesWithin(int startFrame, int endFrame) const { PointList points = getPoints(startFrame, endFrame); NoteList notes;
--- a/data/model/SparseModel.h Tue Jun 17 14:33:42 2014 +0100 +++ b/data/model/SparseModel.h Tue Jun 17 14:49:49 2014 +0100 @@ -157,7 +157,7 @@ return s; } - virtual QString toDelimitedDataString(QString delimiter, int f0, int f1) const + virtual QString toDelimitedDataStringSubset(QString delimiter, int f0, int f1) const { QString s; for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) {
--- a/rdf/RDFFeatureWriter.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/rdf/RDFFeatureWriter.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -534,7 +534,7 @@ // iterate through FeatureLists - for (int i = 0; i < featureList.size(); ++i) { + for (int i = 0; i < (int)featureList.size(); ++i) { const Plugin::Feature &feature = featureList[i]; unsigned long featureNumber = m_count++; @@ -597,7 +597,7 @@ stream << ";\n"; //!!! named bins? stream << " af:feature \"" << feature.values[0]; - for (int j = 1; j < feature.values.size(); ++j) { + for (int j = 1; j < (int)feature.values.size(); ++j) { stream << " " << feature.values[j]; } stream << "\" "; @@ -609,7 +609,7 @@ void RDFFeatureWriter::writeTrackLevelRDF(QTextStream *sptr, - const Transform &transform, + const Transform &, const Plugin::OutputDescriptor& od, const Plugin::FeatureList& featureList, PluginRDFDescription &desc, @@ -618,7 +618,7 @@ if (featureList.empty()) return; QTextStream &stream = *sptr; - bool plain = (m_plain || !desc.haveDescription()); +// bool plain = (m_plain || !desc.haveDescription()); QString outputId = od.identifier.c_str(); QString featureUri = desc.getOutputFeatureAttributeURI(outputId); @@ -628,7 +628,7 @@ return; } - for (int i = 0; i < featureList.size(); ++i) { + for (int i = 0; i < (int)featureList.size(); ++i) { const Plugin::Feature &feature = featureList[i]; @@ -679,13 +679,13 @@ stream << "\n:feature_timeline_" << featureNumber << " a tl:DiscreteTimeLine .\n\n"; - size_t stepSize = transform.getStepSize(); + int stepSize = transform.getStepSize(); if (stepSize == 0) { cerr << "RDFFeatureWriter: INTERNAL ERROR: writing dense features without having set the step size properly!" << endl; return; } - size_t blockSize = transform.getBlockSize(); + int blockSize = transform.getBlockSize(); if (blockSize == 0) { cerr << "RDFFeatureWriter: INTERNAL ERROR: writing dense features without having set the block size properly!" << endl; return; @@ -756,11 +756,11 @@ QString &str = m_openDenseFeatures[sp].second; QTextStream stream(&str); - for (int i = 0; i < featureList.size(); ++i) { + for (int i = 0; i < (int)featureList.size(); ++i) { const Plugin::Feature &feature = featureList[i]; - for (int j = 0; j < feature.values.size(); ++j) { + for (int j = 0; j < (int)feature.values.size(); ++j) { stream << feature.values[j] << " "; } }
--- a/rdf/RDFFeatureWriter.h Tue Jun 17 14:33:42 2014 +0100 +++ b/rdf/RDFFeatureWriter.h Tue Jun 17 14:49:49 2014 +0100 @@ -126,7 +126,7 @@ bool m_network; bool m_networkRetrieved; - unsigned long m_count; + long m_count; }; #endif
--- a/rdf/RDFImporter.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/rdf/RDFImporter.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -576,14 +576,14 @@ RealTime time; RealTime duration; - bool haveTime = false; +// bool haveTime = false; bool haveDuration = false; Node at = m_store->complete(Triple(tn, expand("tl:at"), Node())); if (at != Node()) { time = RealTime::fromXsdDuration(at.value.toStdString()); - haveTime = true; +// haveTime = true; } else { //!!! NB we're using rather old terminology for these things, apparently: // beginsAt -> start @@ -596,7 +596,7 @@ (start.value.toStdString()); duration = RealTime::fromXsdDuration (dur.value.toStdString()); - haveTime = haveDuration = true; +// haveTime = haveDuration = true; } }
--- a/rdf/RDFTransformFactory.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/rdf/RDFTransformFactory.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -156,7 +156,7 @@ } std::vector<Transform> -RDFTransformFactoryImpl::getTransforms(ProgressReporter *reporter) +RDFTransformFactoryImpl::getTransforms(ProgressReporter *) { std::vector<Transform> transforms; @@ -215,7 +215,7 @@ "duration" }; - for (int j = 0; j < sizeof(optionals)/sizeof(optionals[0]); ++j) { + for (int j = 0; j < int(sizeof(optionals)/sizeof(optionals[0])); ++j) { QString optional = optionals[j];
--- a/transform/CSVFeatureWriter.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/CSVFeatureWriter.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -79,7 +79,7 @@ void CSVFeatureWriter::write(QString trackId, const Transform &transform, - const Plugin::OutputDescriptor& output, + const Plugin::OutputDescriptor& , const Plugin::FeatureList& features, std::string summaryType) {
--- a/transform/FeatureExtractionModelTransformer.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/FeatureExtractionModelTransformer.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -112,11 +112,11 @@ TransformFactory::getInstance()->setPluginParameters (primaryTransform, m_plugin); - size_t channelCount = input->getChannelCount(); - if (m_plugin->getMaxChannelCount() < channelCount) { + int channelCount = input->getChannelCount(); + if ((int)m_plugin->getMaxChannelCount() < channelCount) { channelCount = 1; } - if (m_plugin->getMinChannelCount() > channelCount) { + if ((int)m_plugin->getMinChannelCount() > channelCount) { m_message = tr("Cannot provide enough channels to feature extraction plugin \"%1\" (plugin min is %2, max %3; input model has %4)") .arg(pluginId) .arg(m_plugin->getMinChannelCount()) @@ -133,8 +133,8 @@ primaryTransform.getStepSize(), primaryTransform.getBlockSize())) { - size_t pstep = primaryTransform.getStepSize(); - size_t pblock = primaryTransform.getBlockSize(); + int pstep = primaryTransform.getStepSize(); + int pblock = primaryTransform.getBlockSize(); ///!!! hang on, this isn't right -- we're modifying a copy primaryTransform.setStepSize(0); @@ -204,7 +204,7 @@ } } - if (m_descriptors.size() <= j) { + if ((int)m_descriptors.size() <= j) { m_message = tr("Plugin \"%1\" has no output named \"%2\"") .arg(pluginId) .arg(m_transforms[j].getOutput()); @@ -249,8 +249,8 @@ haveExtents = true; } - size_t modelRate = input->getSampleRate(); - size_t modelResolution = 1; + int modelRate = input->getSampleRate(); + int modelResolution = 1; if (m_descriptors[n]->sampleType != Vamp::Plugin::OutputDescriptor::OneSamplePerStep) { @@ -264,7 +264,7 @@ case Vamp::Plugin::OutputDescriptor::VariableSampleRate: if (m_descriptors[n]->sampleRate != 0.0) { - modelResolution = size_t(modelRate / m_descriptors[n]->sampleRate + 0.001); + modelResolution = int(modelRate / m_descriptors[n]->sampleRate + 0.001); } break; @@ -281,7 +281,7 @@ if (m_descriptors[n]->sampleRate > input->getSampleRate()) { modelResolution = 1; } else { - modelResolution = size_t(round(input->getSampleRate() / + modelResolution = int(round(input->getSampleRate() / m_descriptors[n]->sampleRate)); } break; @@ -455,7 +455,7 @@ if (!m_descriptors[n]->binNames.empty()) { std::vector<QString> names; - for (size_t i = 0; i < m_descriptors[n]->binNames.size(); ++i) { + for (int i = 0; i < (int)m_descriptors[n]->binNames.size(); ++i) { names.push_back(m_descriptors[n]->binNames[i].c_str()); } model->setBinNames(names); @@ -477,7 +477,7 @@ { // SVDEBUG << "FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer()" << endl; delete m_plugin; - for (int j = 0; j < m_descriptors.size(); ++j) { + for (int j = 0; j < (int)m_descriptors.size(); ++j) { delete m_descriptors[j]; } } @@ -573,27 +573,27 @@ } if (m_abandoned) return; - size_t sampleRate = input->getSampleRate(); + int sampleRate = input->getSampleRate(); - size_t channelCount = input->getChannelCount(); - if (m_plugin->getMaxChannelCount() < channelCount) { + int channelCount = input->getChannelCount(); + if ((int)m_plugin->getMaxChannelCount() < channelCount) { channelCount = 1; } float **buffers = new float*[channelCount]; - for (size_t ch = 0; ch < channelCount; ++ch) { + for (int ch = 0; ch < channelCount; ++ch) { buffers[ch] = new float[primaryTransform.getBlockSize() + 2]; } - size_t stepSize = primaryTransform.getStepSize(); - size_t blockSize = primaryTransform.getBlockSize(); + int stepSize = primaryTransform.getStepSize(); + int blockSize = primaryTransform.getBlockSize(); bool frequencyDomain = (m_plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain); std::vector<FFTModel *> fftModels; if (frequencyDomain) { - for (size_t ch = 0; ch < channelCount; ++ch) { + for (int ch = 0; ch < channelCount; ++ch) { FFTModel *model = new FFTModel (getConformingInput(), channelCount == 1 ? m_input.getChannel() : ch, @@ -677,10 +677,10 @@ // channelCount is either m_input.getModel()->channelCount or 1 if (frequencyDomain) { - for (size_t ch = 0; ch < channelCount; ++ch) { + for (int ch = 0; ch < channelCount; ++ch) { int column = (blockFrame - startFrame) / stepSize; fftModels[ch]->getValuesAt(column, reals, imaginaries); - for (size_t i = 0; i <= blockSize/2; ++i) { + for (int i = 0; i <= blockSize/2; ++i) { buffers[ch][i*2] = reals[i]; buffers[ch][i*2+1] = imaginaries[i]; } @@ -703,7 +703,7 @@ if (m_abandoned) break; for (int j = 0; j < (int)m_outputNos.size(); ++j) { - for (size_t fi = 0; fi < features[m_outputNos[j]].size(); ++fi) { + for (int fi = 0; fi < (int)features[m_outputNos[j]].size(); ++fi) { Vamp::Plugin::Feature feature = features[m_outputNos[j]][fi]; addFeature(j, blockFrame, feature); } @@ -723,7 +723,7 @@ Vamp::Plugin::FeatureSet features = m_plugin->getRemainingFeatures(); for (int j = 0; j < (int)m_outputNos.size(); ++j) { - for (size_t fi = 0; fi < features[m_outputNos[j]].size(); ++fi) { + for (int fi = 0; fi < (int)features[m_outputNos[j]].size(); ++fi) { Vamp::Plugin::Feature feature = features[m_outputNos[j]][fi]; addFeature(j, blockFrame, feature); } @@ -735,7 +735,7 @@ } if (frequencyDomain) { - for (size_t ch = 0; ch < channelCount; ++ch) { + for (int ch = 0; ch < channelCount; ++ch) { delete fftModels[ch]; } delete[] reals; @@ -805,10 +805,10 @@ void FeatureExtractionModelTransformer::addFeature(int n, - size_t blockFrame, + int blockFrame, const Vamp::Plugin::Feature &feature) { - size_t inputRate = m_input.getModel()->getSampleRate(); + int inputRate = m_input.getModel()->getSampleRate(); // cerr << "FeatureExtractionModelTransformer::addFeature: blockFrame = " // << blockFrame << ", hasTimestamp = " << feature.hasTimestamp @@ -816,11 +816,6 @@ // << feature.hasDuration << ", duration = " << feature.duration // << endl; - int binCount = 1; - if (m_descriptors[n]->hasFixedBinCount) { - binCount = m_descriptors[n]->binCount; - } - int frame = blockFrame; if (m_descriptors[n]->sampleType == @@ -885,7 +880,7 @@ getConformingOutput<SparseTimeValueModel>(n); if (!model) return; - for (int i = 0; i < feature.values.size(); ++i) { + for (int i = 0; i < (int)feature.values.size(); ++i) { float value = feature.values[i]; @@ -912,7 +907,7 @@ int index = 0; float value = 0.0; - if (feature.values.size() > index) { + if ((int)feature.values.size() > index) { value = feature.values[index++]; } @@ -920,7 +915,7 @@ if (feature.hasDuration) { duration = Vamp::RealTime::realTime2Frame(feature.duration, inputRate); } else { - if (feature.values.size() > index) { + if ((int)feature.values.size() > index) { duration = feature.values[index++]; } } @@ -928,7 +923,7 @@ if (isOutput<FlexiNoteModel>(n)) { // GF: added for flexi note model float velocity = 100; - if (feature.values.size() > index) { + if ((int)feature.values.size() > index) { velocity = feature.values[index++]; } if (velocity < 0) velocity = 127; @@ -944,7 +939,7 @@ } else if (isOutput<NoteModel>(n)) { float velocity = 100; - if (feature.values.size() > index) { + if ((int)feature.values.size() > index) { velocity = feature.values[index++]; } if (velocity < 0) velocity = 127; @@ -963,7 +958,7 @@ if (feature.hasDuration && !feature.values.empty()) { - for (int i = 0; i < feature.values.size(); ++i) { + for (int i = 0; i < (int)feature.values.size(); ++i) { float value = feature.values[i];
--- a/transform/FeatureExtractionModelTransformer.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/FeatureExtractionModelTransformer.h Tue Jun 17 14:49:49 2014 +0100 @@ -66,7 +66,7 @@ SparseTimeValueModel *getAdditionalModel(int transformNo, int binNo); void addFeature(int n, - size_t blockFrame, + int blockFrame, const Vamp::Plugin::Feature &feature); void setCompletion(int, int);
--- a/transform/FeatureWriter.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/FeatureWriter.h Tue Jun 17 14:49:49 2014 +0100 @@ -49,7 +49,7 @@ return ParameterList(); } - virtual void setParameters(map<string, string> ¶ms) { + virtual void setParameters(map<string, string> &) { return; } @@ -57,7 +57,7 @@ QString title; QString maker; }; - virtual void setTrackMetadata(QString trackid, TrackMetadata metadata) { } + virtual void setTrackMetadata(QString /* trackid */, TrackMetadata) { } class FailedToOpenOutputStream : virtual public std::exception { @@ -93,7 +93,7 @@ * really an optimisation to ensure that easy-to-recognise failure * cases fail early. */ - virtual void testOutputFile(QString trackId, TransformId transformId) { } + virtual void testOutputFile(QString /* trackId */, TransformId) { } virtual void flush() { } // whatever the last stream was
--- a/transform/FileFeatureWriter.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/FileFeatureWriter.h Tue Jun 17 14:49:49 2014 +0100 @@ -67,7 +67,7 @@ QFile *getOutputFile(QString, TransformId); // subclass can implement this to be called before file is opened for append - virtual void reviewFileForAppending(QString filename) { } + virtual void reviewFileForAppending(QString) { } int m_support; QString m_extension;
--- a/transform/ModelTransformerFactory.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/ModelTransformerFactory.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -55,8 +55,8 @@ const std::vector<Model *> &candidateInputModels, Model *defaultInputModel, AudioPlaySource *source, - size_t startFrame, - size_t duration, + int startFrame, + int duration, UserConfigurator *configurator) { ModelTransformer::Input input(0); @@ -70,7 +70,7 @@ QStringList candidateModelNames; QString defaultModelName; QMap<QString, Model *> modelMap; - for (size_t i = 0; i < candidateInputModels.size(); ++i) { + for (int i = 0; i < (int)candidateInputModels.size(); ++i) { QString modelName = candidateInputModels[i]->objectName(); QString origModelName = modelName; int dupcount = 1; @@ -106,11 +106,10 @@ } else if (RealTimePluginFactory::instanceFor(id)) { RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id); - const RealTimePluginDescriptor *desc = factory->getPluginDescriptor(id); - size_t sampleRate = inputModel->getSampleRate(); - size_t blockSize = 1024; - size_t channels = 1; + int sampleRate = inputModel->getSampleRate(); + int blockSize = 1024; + int channels = 1; if (source) { sampleRate = source->getTargetSampleRate(); blockSize = source->getTargetBlockSize(); @@ -234,7 +233,7 @@ QString trn = TransformFactory::getInstance()->getTransformFriendlyName (transforms[0].getIdentifier()); - for (int i = 0; i < models.size(); ++i) { + for (int i = 0; i < (int)models.size(); ++i) { if (imn != "") { if (trn != "") { models[i]->setObjectName(tr("%1: %2").arg(imn).arg(trn));
--- a/transform/ModelTransformerFactory.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/ModelTransformerFactory.h Tue Jun 17 14:49:49 2014 +0100 @@ -47,8 +47,8 @@ Vamp::PluginBase *plugin, Model *&inputModel, AudioPlaySource *source, - size_t startFrame, - size_t duration, + int startFrame, + int duration, const QMap<QString, Model *> &modelMap, QStringList candidateModelNames, QString defaultModelName) = 0; @@ -67,8 +67,8 @@ const std::vector<Model *> &candidateInputModels, Model *defaultInputModel, AudioPlaySource *source = 0, - size_t startFrame = 0, - size_t duration = 0, + int startFrame = 0, + int duration = 0, UserConfigurator *configurator = 0); class AdditionalModelHandler {
--- a/transform/RealTimeEffectModelTransformer.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/RealTimeEffectModelTransformer.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -82,7 +82,7 @@ if (m_outputNo == -1) { - size_t outputChannels = m_plugin->getAudioOutputCount(); + int outputChannels = m_plugin->getAudioOutputCount(); if (outputChannels > input->getChannelCount()) { outputChannels = input->getChannelCount(); } @@ -137,8 +137,8 @@ if (stvm && (m_outputNo >= int(m_plugin->getControlOutputCount()))) return; - size_t sampleRate = input->getSampleRate(); - size_t channelCount = input->getChannelCount(); + int sampleRate = input->getSampleRate(); + int channelCount = input->getChannelCount(); if (!wwfm && m_input.getChannel() != -1) channelCount = 1; long blockSize = m_plugin->getBufferSize(); @@ -197,7 +197,7 @@ inbufs[0][got++] = 0.0; } } - for (size_t ch = 1; ch < m_plugin->getAudioInputCount(); ++ch) { + for (int ch = 1; ch < (int)m_plugin->getAudioInputCount(); ++ch) { for (long i = 0; i < blockSize; ++i) { inbufs[ch][i] = inbufs[0][i]; } @@ -208,13 +208,13 @@ blockFrame, blockSize, inbufs); while (got < blockSize) { - for (size_t ch = 0; ch < channelCount; ++ch) { + for (int ch = 0; ch < channelCount; ++ch) { inbufs[ch][got] = 0.0; } ++got; } } - for (size_t ch = channelCount; ch < m_plugin->getAudioInputCount(); ++ch) { + for (int ch = channelCount; ch < (int)m_plugin->getAudioInputCount(); ++ch) { for (long i = 0; i < blockSize; ++i) { inbufs[ch][i] = inbufs[ch % channelCount][i]; } @@ -224,9 +224,9 @@ /* cerr << "Input for plugin: " << m_plugin->getAudioInputCount() << " channels "<< endl; - for (size_t ch = 0; ch < m_plugin->getAudioInputCount(); ++ch) { + for (int ch = 0; ch < m_plugin->getAudioInputCount(); ++ch) { cerr << "Input channel " << ch << endl; - for (size_t i = 0; i < 100; ++i) { + for (int i = 0; i < 100; ++i) { cerr << inbufs[ch][i] << " "; if (isnan(inbufs[ch][i])) { cerr << "\n\nWARNING: NaN in audio input" << endl; @@ -263,7 +263,7 @@ long offset = latency - blockFrame; long count = blockSize - offset; float **tmp = new float *[channelCount]; - for (size_t c = 0; c < channelCount; ++c) { + for (int c = 0; c < channelCount; ++c) { tmp[c] = outbufs[c] + offset; } wwfm->addSamples(tmp, count);
--- a/transform/Transform.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/Transform.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -66,7 +66,7 @@ QDomNamedNodeMap attrNodes = transformElt.attributes(); QXmlAttributes attrs; - for (unsigned int i = 0; i < attrNodes.length(); ++i) { + for (int i = 0; i < attrNodes.length(); ++i) { QDomAttr attr = attrNodes.item(i).toAttr(); if (!attr.isNull()) attrs.append(attr.name(), "", "", attr.value()); } @@ -319,26 +319,26 @@ m_summaryType = type; } -size_t +int Transform::getStepSize() const { return m_stepSize; } void -Transform::setStepSize(size_t s) +Transform::setStepSize(int s) { m_stepSize = s; } -size_t +int Transform::getBlockSize() const { return m_blockSize; } void -Transform::setBlockSize(size_t s) +Transform::setBlockSize(int s) { m_blockSize = s; }
--- a/transform/Transform.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/Transform.h Tue Jun 17 14:49:49 2014 +0100 @@ -120,11 +120,11 @@ QString getProgram() const; void setProgram(QString program); - size_t getStepSize() const; - void setStepSize(size_t s); + int getStepSize() const; + void setStepSize(int s); - size_t getBlockSize() const; - void setBlockSize(size_t s); + int getBlockSize() const; + void setBlockSize(int s); WindowType getWindowType() const; void setWindowType(WindowType type); @@ -189,8 +189,8 @@ SummaryType m_summaryType; QString m_pluginVersion; QString m_program; - size_t m_stepSize; - size_t m_blockSize; + int m_stepSize; + int m_blockSize; WindowType m_windowType; RealTime m_startTime; RealTime m_duration;
--- a/transform/TransformFactory.cpp Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/TransformFactory.cpp Tue Jun 17 14:49:49 2014 +0100 @@ -405,7 +405,7 @@ FeatureExtractionPluginFactory::getAllPluginIdentifiers(); if (m_exiting) return; - for (size_t i = 0; i < plugs.size(); ++i) { + for (int i = 0; i < (int)plugs.size(); ++i) { QString pluginId = plugs[i]; @@ -431,7 +431,7 @@ Vamp::Plugin::OutputList outputs = plugin->getOutputDescriptors(); - for (size_t j = 0; j < outputs.size(); ++j) { + for (int j = 0; j < (int)outputs.size(); ++j) { QString transformId = QString("%1:%2") .arg(pluginId).arg(outputs[j].identifier.c_str()); @@ -506,7 +506,7 @@ static QRegExp unitRE("[\\[\\(]([A-Za-z0-9/]+)[\\)\\]]$"); - for (size_t i = 0; i < plugs.size(); ++i) { + for (int i = 0; i < (int)plugs.size(); ++i) { QString pluginId = plugs[i]; @@ -539,14 +539,14 @@ if (descriptor->audioInputPortCount > 0) { - for (size_t j = 0; j < descriptor->controlOutputPortCount; ++j) { + for (int j = 0; j < (int)descriptor->controlOutputPortCount; ++j) { QString transformId = QString("%1:%2").arg(pluginId).arg(j); QString userName; QString units; QString portName; - if (j < descriptor->controlOutputPortNames.size() && + if (j < (int)descriptor->controlOutputPortNames.size() && descriptor->controlOutputPortNames[j] != "") { portName = descriptor->controlOutputPortNames[j].c_str(); @@ -749,7 +749,7 @@ } Transform -TransformFactory::getDefaultTransformFor(TransformId id, size_t rate) +TransformFactory::getDefaultTransformFor(TransformId id, int rate) { Transform t; t.setIdentifier(id); @@ -781,7 +781,7 @@ } Vamp::PluginBase * -TransformFactory::instantiateDefaultPluginFor(TransformId identifier, size_t rate) +TransformFactory::instantiateDefaultPluginFor(TransformId identifier, int rate) { Transform t; t.setIdentifier(identifier);
--- a/transform/TransformFactory.h Tue Jun 17 14:33:42 2014 +0100 +++ b/transform/TransformFactory.h Tue Jun 17 14:49:49 2014 +0100 @@ -88,7 +88,7 @@ * with different parameters and execution context settings. * Return the default one for the given transform. */ - Transform getDefaultTransformFor(TransformId identifier, size_t rate = 0); + Transform getDefaultTransformFor(TransformId identifier, int rate = 0); /** * Full name of a transform, suitable for putting on a menu. @@ -210,7 +210,7 @@ void populateFeatureExtractionPlugins(TransformDescriptionMap &); void populateRealTimePlugins(TransformDescriptionMap &); - Vamp::PluginBase *instantiateDefaultPluginFor(TransformId id, size_t rate); + Vamp::PluginBase *instantiateDefaultPluginFor(TransformId id, int rate); QMutex m_transformsMutex; QMutex m_uninstalledTransformsMutex;