Mercurial > hg > svapp
changeset 240:e8961a95b3d6 integration_library
Merge from the default branch
| author | mathieub <mathieu.barthet@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 23 Aug 2011 12:03:55 +0100 |
| parents | 4d1501b27075 (current diff) 5e1711be654d (diff) |
| children | a99de38af73f |
| files | audioio/AudioCallbackPlaySource.h |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
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