comparison audioio/AudioGenerator.cpp @ 41:a4a05344c7d6

* Change preferences dialog to ok/apply/cancel model
* Make preferences persist in a config file
* Change instance() to getInstance() for all singleton types
* Make pasting to time-value layer with no values in clipboard ask you how to
  generate the values
* Fix bad behaviour caused by importing "data"-type (i.e. 3d dense) model from
  annotation file without a fixed window size available

 
 AudioGenerator::AudioGenerator() :
     m_sourceSampleRate(0),
     m_targetChannelCount(1)
 {
-    connect(PlayParameterRepository::instance(),
+    connect(PlayParameterRepository::getInstance(),
             SIGNAL(playPluginIdChanged(const Model *, QString)),
             this,
             SLOT(playPluginIdChanged(const Model *, QString)));
 
-    connect(PlayParameterRepository::instance(),
+    connect(PlayParameterRepository::getInstance(),
             SIGNAL(playPluginConfigurationChanged(const Model *, QString)),
             this,
             SLOT(playPluginConfigurationChanged(const Model *, QString)));
 }
 

 AudioGenerator::getSampleDir()
 {
     if (m_sampleDir != "") return m_sampleDir;
 
     try {
-        m_sampleDir = TempDirectory::instance()->getSubDirectoryPath("samples");
+        m_sampleDir = TempDirectory::getInstance()->getSubDirectoryPath("samples");
     } catch (DirectoryCreationFailed f) {
         std::cerr << "WARNING: AudioGenerator::getSampleDir: Failed to create "
                   << "temporary sample directory" << std::endl;
         m_sampleDir = "";
         return "";

 AudioGenerator::loadPluginFor(const Model *model)
 {
     QString pluginId, configurationXml;
 
     PlayParameters *parameters =
-	PlayParameterRepository::instance()->getPlayParameters(model);
+	PlayParameterRepository::getInstance()->getPlayParameters(model);
     if (parameters) {
         pluginId = parameters->getPlayPluginId();
         configurationXml = parameters->getPlayPluginConfiguration();
     }
 

     }
 
     QMutexLocker locker(&m_mutex);
 
     PlayParameters *parameters =
-	PlayParameterRepository::instance()->getPlayParameters(model);
+	PlayParameterRepository::getInstance()->getPlayParameters(model);
     if (!parameters) return frameCount;
 
     bool playing = !parameters->isPlayMuted();
     if (!playing) return frameCount;