diff options
| author | Iain <qt-info@nokia.com> | 2009-10-21 12:45:12 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-10-21 12:45:12 (GMT) |
| commit | 1f3200b2cd25a379079700dea489901970845b0f (patch) | |
| tree | eeeab85b645f53da6e9679240b36d42bf1ef1880 /src/multimedia/audio/qaudiooutput_alsa_p.h | |
| parent | 9b6753eac7439caa2dd8915ed3616cef6d1f6cd0 (diff) | |
| parent | 522fc01a18b9eae80b733befb98a948f0fbbba06 (diff) | |
| download | Qt-1f3200b2cd25a379079700dea489901970845b0f.zip Qt-1f3200b2cd25a379079700dea489901970845b0f.tar.gz Qt-1f3200b2cd25a379079700dea489901970845b0f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtMultimediau.def
src/s60installs/eabi/QtNetworku.def
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_alsa_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h index 6d4177d..298e89e 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.h +++ b/src/multimedia/audio/qaudiooutput_alsa_p.h @@ -134,6 +134,7 @@ private: QByteArray m_device; int bytesAvailable; QTime timeStamp; + QTime clockStamp; qint64 elapsedTimeOffset; char* audioBuffer; snd_pcm_t* handle; |