# HG changeset patch
# User mathieub <mathieu.barthet@eecs.qmul.ac.uk>
# Date 1314097435 -3600
# Node ID e8961a95b3d6f004ad1dc3d66c81123e3899779f
# Parent  4d1501b27075493ed029c78df48abb12cfb9bf34# Parent  5e1711be654d820c25b8c346cad19cd6b71c29c8
Merge from the default branch

diff -r 4d1501b27075 -r e8961a95b3d6 audioio/AudioCallbackPlaySource.h
--- a/audioio/AudioCallbackPlaySource.h	Mon Jul 25 17:57:59 2011 +0100
+++ b/audioio/AudioCallbackPlaySource.h	Tue Aug 23 12:03:55 2011 +0100
@@ -52,7 +52,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