Mercurial > hg > svapp

changeset 243:6a730f6bd010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 28 Sep 2011 10:17:35 +0100
parents 819fd4147acf (current diff) 5e1711be654d (diff)
children f853dfb200de
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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