Remove QAudioProbe and QVideoProbe

They worked very inconsistently between platforms (or not at all)
and made the implementation quite a bit more complex.

Longer term they will get replaced by adding the possibility
to have multiple audio/video outputs and implementing monitoring
output classes that can deliver QAudioBuffers and QVideoFrames to
the app.

Change-Id: Ic5b4506e7392d352d33b51f01ff0d5169d7b5129
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 13 insertions, 19 deletions

diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index ae9a0cd5c..d5ec48fd6 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -53,7 +53,6 @@
 
 #include "ui_audiorecorder.h"
 
-#include <QAudioProbe>
 #include <QMediaRecorder>
 #include <QDir>
 #include <QFileDialog>
@@ -61,6 +60,7 @@
 #include <QStandardPaths>
 #include <qmediadevicemanager.h>
 #include <qaudiodeviceinfo.h>
+#include <qaudiobuffer.h>
 
 static qreal getPeakValue(const QAudioFormat &format);
 static QList<qreal> getBufferLevels(const QAudioBuffer &buffer);
@@ -74,10 +74,11 @@ AudioRecorder::AudioRecorder()
     ui->setupUi(this);
 
     m_audioRecorder = new QMediaRecorder(QMediaRecorder::AudioOnly, this);
-    m_probe = new QAudioProbe(this);
-    connect(m_probe, &QAudioProbe::audioBufferProbed,
-            this, &AudioRecorder::processBuffer);
-    m_probe->setSource(m_audioRecorder);
+    // ### replace with a monitoring output once we have it.
+//    m_probe = new QAudioProbe(this);
+//    connect(m_probe, &QAudioProbe::audioBufferProbed,
+//            this, &AudioRecorder::processBuffer);
+//    m_probe->setSource(m_audioRecorder);
 
     QMediaDeviceManager *manager = QMediaDeviceManager::instance();
 
diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
index 05b41cda4..4d253d6b6 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.h
+++ b/examples/multimedia/audiorecorder/audiorecorder.h
@@ -58,7 +58,6 @@
 QT_BEGIN_NAMESPACE
 namespace Ui { class AudioRecorder; }
 class QMediaRecorder;
-class QAudioProbe;
 class QAudioBuffer;
 QT_END_NAMESPACE
 
@@ -90,7 +89,6 @@ private:
     Ui::AudioRecorder *ui = nullptr;
 
     QMediaRecorder *m_audioRecorder = nullptr;
-    QAudioProbe *m_probe = nullptr;
     QList<AudioLevel*> m_audioLevels;
     bool m_outputLocationSet = false;
 
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index b3d1d4123..fe46dc137 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -57,8 +57,6 @@
 
 #include <QMediaService>
 #include <QMediaPlaylist>
-#include <QVideoProbe>
-#include <QAudioProbe>
 #include <QMediaMetaData>
 #include <QMediaDeviceManager>
 #include <QAudioDeviceInfo>
@@ -115,13 +113,14 @@ Player::Player(QWidget *parent)
     histogramLayout->addWidget(m_videoHistogram, 1);
     histogramLayout->addWidget(m_audioHistogram, 2);
 
-    m_videoProbe = new QVideoProbe(this);
-    connect(m_videoProbe, &QVideoProbe::videoFrameProbed, m_videoHistogram, &HistogramWidget::processFrame);
-    m_videoProbe->setSource(m_player);
+    // ### replace by a monitoring outputs once we have them
+//    m_videoProbe = new QVideoProbe(this);
+//    connect(m_videoProbe, &QVideoProbe::videoFrameProbed, m_videoHistogram, &HistogramWidget::processFrame);
+//    m_videoProbe->setSource(m_player);
 
-    m_audioProbe = new QAudioProbe(this);
-    connect(m_audioProbe, &QAudioProbe::audioBufferProbed, m_audioHistogram, &HistogramWidget::processBuffer);
-    m_audioProbe->setSource(m_player);
+//    m_audioProbe = new QAudioProbe(this);
+//    connect(m_audioProbe, &QAudioProbe::audioBufferProbed, m_audioHistogram, &HistogramWidget::processBuffer);
+//    m_audioProbe->setSource(m_player);
 
     QPushButton *openButton = new QPushButton(tr("Open"), this);
 
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index 9d7ee1d7e..d95ad6191 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -64,9 +64,7 @@ class QPushButton;
 class QComboBox;
 class QSlider;
 class QStatusBar;
-class QVideoProbe;
 class QVideoWidget;
-class QAudioProbe;
 QT_END_NAMESPACE
 
 class PlaylistModel;
@@ -134,8 +132,6 @@ private:
     QLabel *m_labelHistogram = nullptr;
     HistogramWidget *m_videoHistogram = nullptr;
     HistogramWidget *m_audioHistogram = nullptr;
-    QVideoProbe *m_videoProbe = nullptr;
-    QAudioProbe *m_audioProbe = nullptr;
 
     PlaylistModel *m_playlistModel = nullptr;
     QAbstractItemView *m_playlistView = nullptr;