summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-19 09:08:19 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 10:54:17 (GMT)
commit0e0ac26bc58626df780e0fc3bc0483d5b310db8b (patch)
tree9c98c1c63cc66d590ee8592d1d5f9520c38388d4 /src
parent0f771c62f5253a969f5a8a81bfd9254b9bd58b8f (diff)
downloadQt-0e0ac26bc58626df780e0fc3bc0483d5b310db8b.zip
Qt-0e0ac26bc58626df780e0fc3bc0483d5b310db8b.tar.gz
Qt-0e0ac26bc58626df780e0fc3bc0483d5b310db8b.tar.bz2
Port QtMultimedia uses of QTime as a stopwatch to QTimestamp (unix code only)
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/audio/qaudioinput_alsa_p.h5
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h
index 92cef83..9a87691 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
@@ -61,6 +61,7 @@
#include <QtCore/qtimer.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
+#include <QtCore/qtimestamp.h>
#include <QtCore/qdatetime.h>
#include <QtMultimedia/qaudio.h>
@@ -116,8 +117,8 @@ private:
void drain();
QTimer* timer;
- QTime timeStamp;
- QTime clockStamp;
+ QTimestamp timeStamp;
+ QTimestamp clockStamp;
qint64 elapsedTimeOffset;
int intervalTime;
char* audioBuffer;
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h
index 802bc27..c655701 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -60,6 +60,7 @@
#include <QtCore/qtimer.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
+#include <QtCore/qtimestamp.h>
#include <QtCore/qdatetime.h>
#include <QtMultimedia/qaudio.h>
@@ -133,8 +134,8 @@ private:
QTimer* timer;
QByteArray m_device;
int bytesAvailable;
- QTime timeStamp;
- QTime clockStamp;
+ QTimestamp timeStamp;
+ QTimestamp clockStamp;
qint64 elapsedTimeOffset;
char* audioBuffer;
snd_pcm_t* handle;