# HG changeset patch
# User Chris Cannam
# Date 1585912445 -3600
# Node ID 771ec060c1d2af545519a8322d7078778b65fd4f
# Parent  7b1d30af4b38537c800debd57e8d0d7a2090c9b4# Parent  1c6c10cc5f73ff32b54197ed1060ad0558ed8197
Merge from branch audio-source-refactor. Pull out auditioning effect wrapper and time stretch wrapper from play source; corresponding changes to plugin memory management etc.

diff -r 1c6c10cc5f73 -r 771ec060c1d2 audio/AudioCallbackPlaySource.cpp
--- a/audio/AudioCallbackPlaySource.cpp	Fri Apr 03 12:13:04 2020 +0100
+++ b/audio/AudioCallbackPlaySource.cpp	Fri Apr 03 12:14:05 2020 +0100
@@ -757,7 +757,7 @@
     RealTime bufferedto_t = RealTime::frame2RealTime(readBufferFill, rate);
 
 #ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
-    cout << "\nbuffered to: " << bufferedto_t << ", in buffer: " << inbuffer_t << ", time ratio " << timeRatio << "\n  stretcher latency: " << stretchlat_t << ", device latency: " << latency_t << "\n  since request: " << sincerequest_t << ", last retrieved quantity: " << lastretrieved_t << endl;
+    cout << "\nbuffered to: " << bufferedto_t << ", in buffer: " << inbuffer_t << ", device latency: " << latency_t << "\n  since request: " << sincerequest_t << ", last retrieved quantity: " << lastretrieved_t << endl;
 #endif
 
     // Normally the range lists should contain at least one item each
diff -r 1c6c10cc5f73 -r 771ec060c1d2 framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Fri Apr 03 12:13:04 2020 +0100
+++ b/framework/MainWindowBase.cpp	Fri Apr 03 12:14:05 2020 +0100
@@ -238,8 +238,12 @@
             this, SLOT(currentPaneChanged(Pane *)));
     connect(m_paneStack, SIGNAL(currentLayerChanged(Pane *, Layer *)),
             this, SLOT(currentLayerChanged(Pane *, Layer *)));
-    connect(m_paneStack, SIGNAL(rightButtonMenuRequested(Pane *, QPoint)),
-            this, SLOT(rightButtonMenuRequested(Pane *, QPoint)));
+    connect(m_paneStack, SIGNAL(paneRightButtonMenuRequested(Pane *, QPoint)),
+            this, SLOT(paneRightButtonMenuRequested(Pane *, QPoint)));
+    connect(m_paneStack, SIGNAL(panePropertiesRightButtonMenuRequested(Pane *, QPoint)),
+            this, SLOT(panePropertiesRightButtonMenuRequested(Pane *, QPoint)));
+    connect(m_paneStack, SIGNAL(layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint)),
+            this, SLOT(layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint)));
     connect(m_paneStack, SIGNAL(contextHelpChanged(const QString &)),
             this, SLOT(contextHelpChanged(const QString &)));
     connect(m_paneStack, SIGNAL(paneAdded(Pane *)),
diff -r 1c6c10cc5f73 -r 771ec060c1d2 framework/MainWindowBase.h
--- a/framework/MainWindowBase.h	Fri Apr 03 12:13:04 2020 +0100
+++ b/framework/MainWindowBase.h	Fri Apr 03 12:14:05 2020 +0100
@@ -364,7 +364,9 @@
     virtual void alignmentComplete(ModelId);
     virtual void alignmentFailed(QString) = 0;
 
-    virtual void rightButtonMenuRequested(Pane *, QPoint point) = 0;
+    virtual void paneRightButtonMenuRequested(Pane *, QPoint point) = 0;
+    virtual void panePropertiesRightButtonMenuRequested(Pane *, QPoint point) = 0;
+    virtual void layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint point) = 0;
 
     virtual void paneAdded(Pane *) = 0;
     virtual void paneHidden(Pane *) = 0;