# HG changeset patch
# User Chris Cannam
# Date 1154016392 0
# Node ID a4a05344c7d6af3c31caa0d332d4eea2af8287f2
# Parent  a996c0ef6177c74f18db47be72e32821e382c106
* 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

diff -r a996c0ef6177 -r a4a05344c7d6 audioio/AudioCallbackPlaySource.cpp
--- a/audioio/AudioCallbackPlaySource.cpp	Wed Jun 28 15:42:04 2006 +0000
+++ b/audioio/AudioCallbackPlaySource.cpp	Thu Jul 27 16:06:32 2006 +0000
@@ -65,7 +65,7 @@
     connect(m_viewManager, SIGNAL(playSelectionModeChanged()),
 	    this, SLOT(playSelectionModeChanged()));
 
-    connect(PlayParameterRepository::instance(),
+    connect(PlayParameterRepository::getInstance(),
 	    SIGNAL(playParametersChanged(PlayParameters *)),
 	    this, SLOT(playParametersChanged(PlayParameters *)));
 }
diff -r a996c0ef6177 -r a4a05344c7d6 audioio/AudioGenerator.cpp
--- a/audioio/AudioGenerator.cpp	Wed Jun 28 15:42:04 2006 +0000
+++ b/audioio/AudioGenerator.cpp	Thu Jul 27 16:06:32 2006 +0000
@@ -49,12 +49,12 @@
     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)));
@@ -185,7 +185,7 @@
     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;
@@ -223,7 +223,7 @@
     QString pluginId, configurationXml;
 
     PlayParameters *parameters =
-	PlayParameterRepository::instance()->getPlayParameters(model);
+	PlayParameterRepository::getInstance()->getPlayParameters(model);
     if (parameters) {
         pluginId = parameters->getPlayPluginId();
         configurationXml = parameters->getPlayPluginConfiguration();
@@ -364,7 +364,7 @@
     QMutexLocker locker(&m_mutex);
 
     PlayParameters *parameters =
-	PlayParameterRepository::instance()->getPlayParameters(model);
+	PlayParameterRepository::getInstance()->getPlayParameters(model);
     if (!parameters) return frameCount;
 
     bool playing = !parameters->isPlayMuted();