Mercurial > hg > svapp

diff audioio/AudioCallbackPlaySource.h @ 240:e8961a95b3d6 integration_library

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Tue, 23 Aug 2011 12:03:55 +0100
parents 1fcee2a1c03e 5e1711be654d
children
line wrap: on
line diff
--- 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