summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiooutput.h
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2009-11-05 04:18:38 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2009-11-10 03:55:12 (GMT)
commit75fb85bbf1b2dc473f99da72124daa65c5839e01 (patch)
tree83975d52d8430270372400c922f9764d5f7adbf6 /src/multimedia/audio/qaudiooutput.h
parent74d3a4bf9654c8bbe9139951cc5c9352015438a6 (diff)
downloadQt-75fb85bbf1b2dc473f99da72124daa65c5839e01.zip
Qt-75fb85bbf1b2dc473f99da72124daa65c5839e01.tar.gz
Qt-75fb85bbf1b2dc473f99da72124daa65c5839e01.tar.bz2
Changes to low-level audio API.
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
Diffstat (limited to 'src/multimedia/audio/qaudiooutput.h')
-rw-r--r--src/multimedia/audio/qaudiooutput.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index bb3496e..38bab8e 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -71,7 +71,9 @@ public:
QAudioFormat format() const;
- QIODevice* start(QIODevice *device = 0);
+ void start(QIODevice *device);
+ QIODevice* start();
+
void stop();
void reset();
void suspend();
@@ -86,8 +88,8 @@ public:
void setNotifyInterval(int milliSeconds);
int notifyInterval() const;
- qint64 totalTime() const;
- qint64 clock() const;
+ qint64 processedUSecs() const;
+ qint64 elapsedUSecs() const;
QAudio::Error error() const;
QAudio::State state() const;