summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiooutput_alsa_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-26 14:02:26 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 10:54:19 (GMT)
commit21983be486af0d252b8d393ed36b15becb3c8824 (patch)
tree84501a18ef84aac2f186452741ac93f229090894 /src/multimedia/audio/qaudiooutput_alsa_p.h
parente0c97f943e80488c7e674075d40a27822b7e8c78 (diff)
downloadQt-21983be486af0d252b8d393ed36b15becb3c8824.zip
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.gz
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.bz2
Rename QTimestamp to QElapsedTimer
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_alsa_p.h')
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h
index c655701..e6ac231 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -60,7 +60,7 @@
#include <QtCore/qtimer.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
-#include <QtCore/qtimestamp.h>
+#include <QtCore/qelapsedtimer.h>
#include <QtCore/qdatetime.h>
#include <QtMultimedia/qaudio.h>
@@ -134,8 +134,8 @@ private:
QTimer* timer;
QByteArray m_device;
int bytesAvailable;
- QTimestamp timeStamp;
- QTimestamp clockStamp;
+ QElapsedTimer timeStamp;
+ QElapsedTimer clockStamp;
qint64 elapsedTimeOffset;
char* audioBuffer;
snd_pcm_t* handle;