comparison framework/SVFileReader.cpp @ 309:71050ffd0141 tonioni

sampleId -> clipId
author Chris Cannam
date Tue, 07 Jan 2014 15:52:47 +0000
parents 289d65722123
children f72d58d1ccb0
comparison
equal deleted inserted replaced
308:289d65722123 309:71050ffd0141
1269 if (ok) parameters->setPlayPan(pan); 1269 if (ok) parameters->setPlayPan(pan);
1270 1270
1271 float gain = attributes.value("gain").toFloat(&ok); 1271 float gain = attributes.value("gain").toFloat(&ok);
1272 if (ok) parameters->setPlayGain(gain); 1272 if (ok) parameters->setPlayGain(gain);
1273 1273
1274 QString sampleId = attributes.value("sampleId"); 1274 QString clipId = attributes.value("clipId");
1275 if (sampleId != "") parameters->setPlaySampleId(sampleId); 1275 if (clipId != "") parameters->setPlayClipId(clipId);
1276 1276
1277 m_currentPlayParameters = parameters; 1277 m_currentPlayParameters = parameters;
1278 1278
1279 // cerr << "Current play parameters for model: " << m_models[modelId] << ": " << m_currentPlayParameters << endl; 1279 // cerr << "Current play parameters for model: " << m_models[modelId] << ": " << m_currentPlayParameters << endl;
1280 1280
1330 { 1330 {
1331 // Obsolete but supported for compatibility 1331 // Obsolete but supported for compatibility
1332 1332
1333 QString ident = attributes.value("identifier"); 1333 QString ident = attributes.value("identifier");
1334 if (ident == "sample_player") { 1334 if (ident == "sample_player") {
1335 QString sampleId = attributes.value("program"); 1335 QString clipId = attributes.value("program");
1336 if (sampleId != "") m_currentPlayParameters->setPlaySampleId(sampleId); 1336 if (clipId != "") m_currentPlayParameters->setPlayClipId(clipId);
1337 } 1337 }
1338 1338
1339 return true; 1339 return true;
1340 } 1340 }
1341 1341