comparison layer/SpectrogramLayer.cpp @ 47:2e2ad8510e52

* Fix a crash in PortAudio output for mono data
* Don't construct a chromagram in TonalChangeDetect plugin ctor
* Update layer show/hide/dormancy for multi-view-capable layers -- the
  dormancy concept doesn't really work with these constraints any more

 {
     return m_normalizeColumns;
 }
 
 void
-SpectrogramLayer::setLayerDormant(const bool dormant)
-{
-    if (dormant == m_dormant) return;
+SpectrogramLayer::setLayerDormant(const View *v, bool dormant)
+{
+    QMutexLocker locker(&m_mutex);
+
+    if (dormant == m_dormancy[v]) return;
 
     if (dormant) {
 
-	m_mutex.lock();
-	m_dormant = true;
+	m_dormancy[v] = true;
 
 //	delete m_cache;
 //	m_cache = 0;
 	
 	m_cacheInvalid = true;
 	m_pixmapCacheInvalid = true;
 	delete m_pixmapCache;
 	m_pixmapCache = 0;
 	
-	m_mutex.unlock();
-
     } else {
 
-	m_dormant = false;
-	fillCache();
+	m_dormancy[v] = false;
     }
 }
 
 void
 SpectrogramLayer::cacheInvalid()

 
 	bool interrupted = false;
 
 //	std::cerr << "SpectrogramLayer::CacheFillThread::run in loop" << std::endl;
 
-	if (m_layer.m_dormant) {
-
+/*!!! Need a way of finding out whether this layer is dormant in 
+      all the views that are currently visible... or not
+
+	if (m_layer.m_dormancy[) {
+*/
+	if (0) { //!!!
+	
 	    if (m_layer.m_cacheInvalid) {
 		delete m_layer.m_cache;
 		m_layer.m_cache = 0;
 	    }
 

 
     if (!m_model || !m_model->isOK() || !m_model->isReady()) {
 	return;
     }
 
-    if (m_dormant) {
+    if (isLayerDormant(v)) {
 	std::cerr << "SpectrogramLayer::paint(): Layer is dormant" << std::endl;
 	return;
     }
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT