# HG changeset patch # User Chris Cannam # Date 1312988455 -3600 # Node ID 5e1711be654d820c25b8c346cad19cd6b71c29c8 # Parent 1ebd8e13262dd7f939db16c097507e04514844c1 Patch from Michel Alexandre Salim to remove unwanted virtual inheritance from QObject (#258) diff -r 1ebd8e13262d -r 5e1711be654d audioio/AudioCallbackPlaySource.h --- a/audioio/AudioCallbackPlaySource.h Wed Jun 29 09:57:36 2011 +0100 +++ b/audioio/AudioCallbackPlaySource.h Wed Aug 10 16:00:55 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