Changeset 846 for trunk/src/multimedia/audio/qaudioinput_alsa_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/multimedia/audio/qaudioinput_alsa_p.h (modified) (4 diffs)

trunk/src/multimedia/audio/qaudioinput_alsa_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -62 +62 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
+
 #include <QtCore/qdatetime.h>
 
@@ -110 +111 @@
 
 private:
+
     int xrun_recovery(int err);
     int setFormat();
@@ -117 +119 @@
 
     QTimer* timer;
-    QTime timeStamp;
-    QTime clockStamp;
+    Q timeStamp;
+    Q clockStamp;
     qint64 elapsedTimeOffset;
     int intervalTime;