# HG changeset patch
# User Chris Cannam
# Date 1317201455 -3600
# Node ID 6a730f6bd010a214bbaa86d01a7e03bf9ab778cd
# Parent  819fd4147acf346329a903f3799cdc39e64330d3# Parent  5e1711be654d820c25b8c346cad19cd6b71c29c8
Merge

diff -r 819fd4147acf -r 6a730f6bd010 audioio/AudioCallbackPlaySource.h
--- a/audioio/AudioCallbackPlaySource.h	Wed Sep 28 10:16:14 2011 +0100
+++ b/audioio/AudioCallbackPlaySource.h	Wed Sep 28 10:17:35 2011 +0100
@@ -51,7 +51,7 @@
  * provides a method for a realtime thread to pick up the latest
  * available sample data from these buffers.
  */
-class AudioCallbackPlaySource : public virtual QObject,
+class AudioCallbackPlaySource : public QObject,
 				public AudioPlaySource
 {
     Q_OBJECT