diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-17 11:44:34 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-17 11:44:34 (GMT) |
| commit | 2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1 (patch) | |
| tree | 352e76fc210605d285be6d72857a6bbd7db107f9 /src/multimedia/audio/qaudioinput_alsa_p.h | |
| parent | d28a81d51734afd1f3a052f4c4e9fc90aef393e8 (diff) | |
| parent | 7e9052cc1f16b3eeabb73ada9492d91620df796d (diff) | |
| download | Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.zip Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.gz Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/multimedia/audio/qaudioinput_alsa_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_alsa_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h index 92cef83..c907019 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/qelapsedtimer.h> #include <QtCore/qdatetime.h> #include <QtMultimedia/qaudio.h> @@ -116,8 +117,8 @@ private: void drain(); QTimer* timer; - QTime timeStamp; - QTime clockStamp; + QElapsedTimer timeStamp; + QElapsedTimer clockStamp; qint64 elapsedTimeOffset; int intervalTime; char* audioBuffer; |