Mercurial > hg > svapp
changeset 238:5e1711be654d
Patch from Michel Alexandre Salim to remove unwanted virtual inheritance from QObject (#258)
| author | Chris Cannam | 
|---|---|
| date | Wed, 10 Aug 2011 16:00:55 +0100 | 
| parents | 1ebd8e13262d | 
| children | e8961a95b3d6 6a730f6bd010 a9f1850b873d | 
| files | audioio/AudioCallbackPlaySource.h | 
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] | 
line wrap: on
 line diff
--- 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
