summaryrefslogtreecommitdiffstats
path: root/src/multimedia/controls
diff options
context:
space:
mode:
authorLev Zelenskiy <lev.zelenskiy@nokia.com>2012-02-09 16:40:10 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-10 00:57:47 +0100
commit32b68f17f59a7736de6b4928c6c97e7584e6eb6f (patch)
tree75e3eaafbcf209b7c63ad4f97022072102b3cd06 /src/multimedia/controls
parent7b3d3ae4539185d5fa155f13c2e6f7fc7b4be0e2 (diff)
Changes to media probing API.
Added flush signals. Change-Id: I9c124317e843c9b9011e69c44649ae9a4e974161 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/controls')
-rw-r--r--src/multimedia/controls/qmediaaudioprobecontrol.cpp7
-rw-r--r--src/multimedia/controls/qmediaaudioprobecontrol.h1
-rw-r--r--src/multimedia/controls/qmediavideoprobecontrol.cpp6
-rw-r--r--src/multimedia/controls/qmediavideoprobecontrol.h1
4 files changed, 15 insertions, 0 deletions
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
index dc32cbab4..3068fd30c 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
@@ -92,6 +92,13 @@ QMediaAudioProbeControl::~QMediaAudioProbeControl()
media service.
*/
+
+/*!
+ \fn QMediaAudioProbeControl::flush()
+
+ This signal should be emitted when it is required to release all frames.
+*/
+
#include "moc_qmediaaudioprobecontrol.cpp"
QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h
index fd78002ac..f5359b9ad 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.h
@@ -59,6 +59,7 @@ public:
signals:
void audioBufferProbed(const QAudioBuffer &buffer);
+ void flush();
protected:
explicit QMediaAudioProbeControl(QObject *parent = 0);
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp
index f42e17abf..9a723c0a9 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.cpp
+++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp
@@ -92,6 +92,12 @@ QMediaVideoProbeControl::~QMediaVideoProbeControl()
media service.
*/
+/*!
+ \fn QMediaVideoProbeControl::flush()
+
+ This signal should be emitted when it is required to release all frames.
+*/
+
#include "moc_qmediavideoprobecontrol.cpp"
QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h
index 40e64d38f..d2031ca4e 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ b/src/multimedia/controls/qmediavideoprobecontrol.h
@@ -61,6 +61,7 @@ public:
signals:
void videoFrameProbed(const QVideoFrame &frame);
+ void flush();
protected:
explicit QMediaVideoProbeControl(QObject *parent = 0);