Mercurial > hg > svapp

diff framework/MainWindowBase.h @ 470:4480b031fe38 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch bqaudioio
author Chris Cannam
date Tue, 04 Aug 2015 16:39:40 +0100
parents 56acd9368532
children f93820d36cb0
line wrap: on
line diff
--- a/framework/MainWindowBase.h	Fri Jul 24 16:31:54 2015 +0100
+++ b/framework/MainWindowBase.h	Tue Aug 04 16:39:40 2015 +0100
@@ -46,7 +46,6 @@
 class WaveformLayer;
 class WaveFileModel;
 class AudioCallbackPlaySource;
-class AudioCallbackPlayTarget;
 class CommandHistory;
 class QMenu;
 class AudioDial;
@@ -63,6 +62,10 @@
 class QSignalMapper;
 class QShortcut;
 
+namespace breakfastquay {
+class SystemPlaybackTarget;
+}
+
 /**
  * The base class for the SV main window.  This includes everything to
  * do with general document and pane stack management, but nothing
@@ -306,7 +309,7 @@
 
     bool                     m_audioOutput;
     AudioCallbackPlaySource *m_playSource;
-    AudioCallbackPlayTarget *m_playTarget;
+    breakfastquay::SystemPlaybackTarget *m_playTarget;
 
     class OSCQueueStarter : public QThread
     {