diff audioio/AudioGenerator.cpp @ 38:54287e5e7451 sv1-v0.9rc1 sv1-v0.9rc2

* Make vertical scale alignment modes work in note layer as well as time-value layer, and several significant fixes to it * Make it possible to draw notes properly on the note layer * Show units (and frequencies etc in note layer's case) in the time-value and note layer description boxes * Minor fix to item edit dialog layout * Some minor menu rearrangement * Comment out a lot of debug output * Add SV website and reference URLs to Help menu, and add code to (attempt to) open them in the user's preferred browser
author Chris Cannam
date Fri, 12 May 2006 14:40:43 +0000
parents 58cf1620d6e3
children a996c0ef6177
line wrap: on
line diff
--- a/audioio/AudioGenerator.cpp	Thu May 11 15:02:14 2006 +0000
+++ b/audioio/AudioGenerator.cpp	Fri May 12 14:40:43 2006 +0000
@@ -120,7 +120,7 @@
 AudioGenerator::playPluginConfigurationChanged(const Model *model,
                                                QString configurationXml)
 {
-    std::cerr << "AudioGenerator::playPluginConfigurationChanged" << std::endl;
+//    std::cerr << "AudioGenerator::playPluginConfigurationChanged" << std::endl;
 
     if (m_synthMap.find(model) == m_synthMap.end()) {
         std::cerr << "AudioGenerator::playPluginConfigurationChanged: We don't know about this plugin" << std::endl;
@@ -267,6 +267,7 @@
 
     if (!instance) {
 	std::cerr << "Failed to instantiate plugin " << pluginId.toStdString() << std::endl;
+        return 0;
     }
 
     setSampleDir(instance);
@@ -276,11 +277,11 @@
     }
     std::string defaultProgram = instance->getProgram(0, 0);
     if (defaultProgram != "") {
-        std::cerr << "first selecting default program " << defaultProgram << std::endl;
+//        std::cerr << "first selecting default program " << defaultProgram << std::endl;
         instance->selectProgram(defaultProgram);
     }
     if (program != "") {
-        std::cerr << "now selecting desired program " << program.toStdString() << std::endl;
+//        std::cerr << "now selecting desired program " << program.toStdString() << std::endl;
         instance->selectProgram(program.toStdString());
     }
     instance->setIdealChannelCount(m_targetChannelCount); // reset!
@@ -334,7 +335,7 @@
 {
     if (m_targetChannelCount == targetChannelCount) return;
 
-    std::cerr << "AudioGenerator::setTargetChannelCount(" << targetChannelCount << ")" << std::endl;
+//    std::cerr << "AudioGenerator::setTargetChannelCount(" << targetChannelCount << ")" << std::endl;
 
     QMutexLocker locker(&m_mutex);
     m_targetChannelCount = targetChannelCount;