Mercurial > hg > svcore
comparison transform/ModelTransformerFactory.cpp @ 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 | a2689db084f4 |
children | d03b3d956358 |
comparison
equal
deleted
inserted
replaced
929:59e7fe1b1003 | 930:06579b8ffb7b |
---|---|
53 ModelTransformer::Input | 53 ModelTransformer::Input |
54 ModelTransformerFactory::getConfigurationForTransform(Transform &transform, | 54 ModelTransformerFactory::getConfigurationForTransform(Transform &transform, |
55 const std::vector<Model *> &candidateInputModels, | 55 const std::vector<Model *> &candidateInputModels, |
56 Model *defaultInputModel, | 56 Model *defaultInputModel, |
57 AudioPlaySource *source, | 57 AudioPlaySource *source, |
58 size_t startFrame, | 58 int startFrame, |
59 size_t duration, | 59 int duration, |
60 UserConfigurator *configurator) | 60 UserConfigurator *configurator) |
61 { | 61 { |
62 ModelTransformer::Input input(0); | 62 ModelTransformer::Input input(0); |
63 | 63 |
64 if (candidateInputModels.empty()) return input; | 64 if (candidateInputModels.empty()) return input; |
68 //as we'll need to reinitialise the channel settings in the dialog | 68 //as we'll need to reinitialise the channel settings in the dialog |
69 Model *inputModel = candidateInputModels[0]; | 69 Model *inputModel = candidateInputModels[0]; |
70 QStringList candidateModelNames; | 70 QStringList candidateModelNames; |
71 QString defaultModelName; | 71 QString defaultModelName; |
72 QMap<QString, Model *> modelMap; | 72 QMap<QString, Model *> modelMap; |
73 for (size_t i = 0; i < candidateInputModels.size(); ++i) { | 73 for (int i = 0; i < (int)candidateInputModels.size(); ++i) { |
74 QString modelName = candidateInputModels[i]->objectName(); | 74 QString modelName = candidateInputModels[i]->objectName(); |
75 QString origModelName = modelName; | 75 QString origModelName = modelName; |
76 int dupcount = 1; | 76 int dupcount = 1; |
77 while (modelMap.contains(modelName)) { | 77 while (modelMap.contains(modelName)) { |
78 modelName = tr("%1 <%2>").arg(origModelName).arg(++dupcount); | 78 modelName = tr("%1 <%2>").arg(origModelName).arg(++dupcount); |
104 plugin = vp; | 104 plugin = vp; |
105 | 105 |
106 } else if (RealTimePluginFactory::instanceFor(id)) { | 106 } else if (RealTimePluginFactory::instanceFor(id)) { |
107 | 107 |
108 RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id); | 108 RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id); |
109 const RealTimePluginDescriptor *desc = factory->getPluginDescriptor(id); | 109 |
110 | 110 int sampleRate = inputModel->getSampleRate(); |
111 size_t sampleRate = inputModel->getSampleRate(); | 111 int blockSize = 1024; |
112 size_t blockSize = 1024; | 112 int channels = 1; |
113 size_t channels = 1; | |
114 if (source) { | 113 if (source) { |
115 sampleRate = source->getTargetSampleRate(); | 114 sampleRate = source->getTargetSampleRate(); |
116 blockSize = source->getTargetBlockSize(); | 115 blockSize = source->getTargetBlockSize(); |
117 channels = source->getTargetChannelCount(); | 116 channels = source->getTargetChannelCount(); |
118 } | 117 } |
232 if (!models.empty()) { | 231 if (!models.empty()) { |
233 QString imn = input.getModel()->objectName(); | 232 QString imn = input.getModel()->objectName(); |
234 QString trn = | 233 QString trn = |
235 TransformFactory::getInstance()->getTransformFriendlyName | 234 TransformFactory::getInstance()->getTransformFriendlyName |
236 (transforms[0].getIdentifier()); | 235 (transforms[0].getIdentifier()); |
237 for (int i = 0; i < models.size(); ++i) { | 236 for (int i = 0; i < (int)models.size(); ++i) { |
238 if (imn != "") { | 237 if (imn != "") { |
239 if (trn != "") { | 238 if (trn != "") { |
240 models[i]->setObjectName(tr("%1: %2").arg(imn).arg(trn)); | 239 models[i]->setObjectName(tr("%1: %2").arg(imn).arg(trn)); |
241 } else { | 240 } else { |
242 models[i]->setObjectName(imn); | 241 models[i]->setObjectName(imn); |