diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-06 11:18:51 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-06 13:19:15 +0200 |
commit | a7868de41810a1cc2653896ef2d788a74dccd586 (patch) | |
tree | 349afac84c7facdfa20d1abce310d4cf1440269f | |
parent | e2c2b21e530276c216cddf641cf9c0f8098b16ce (diff) |
Remove use of bearer management and the related deprecated classes
It's now been deleted in QtBase.
Task-number: QTBUG-76502
Change-Id: I4dcefa842d66b3444c097315cf7deff5399d6bd9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r-- | src/multimedia/controls/controls.pri | 2 | ||||
-rw-r--r-- | src/multimedia/controls/qmedianetworkaccesscontrol.cpp | 104 | ||||
-rw-r--r-- | src/multimedia/controls/qmedianetworkaccesscontrol.h | 85 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 50 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 24 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp | 36 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp | 1 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h | 69 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h | 11 |
9 files changed, 0 insertions, 382 deletions
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index cfebe9777..a7f943e78 100644 --- a/src/multimedia/controls/controls.pri +++ b/src/multimedia/controls/controls.pri @@ -22,7 +22,6 @@ PUBLIC_HEADERS += \ controls/qimageencodercontrol.h \ controls/qmediacontainercontrol.h \ controls/qmediagaplessplaybackcontrol.h \ - controls/qmedianetworkaccesscontrol.h \ controls/qmediaplayercontrol.h \ controls/qmediarecordercontrol.h \ controls/qmediastreamscontrol.h \ @@ -61,7 +60,6 @@ SOURCES += \ controls/qimageencodercontrol.cpp \ controls/qmediacontainercontrol.cpp \ controls/qmediagaplessplaybackcontrol.cpp \ - controls/qmedianetworkaccesscontrol.cpp \ controls/qmediaplayercontrol.cpp \ controls/qmediaplaylistcontrol.cpp \ controls/qmediaplaylistsourcecontrol.cpp \ diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp deleted file mode 100644 index 9d3f14501..000000000 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmedianetworkaccesscontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaNetworkAccessControl - \obsolete - \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities. - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - The functionality provided by this control allows the - setting of a Network Access Point. - - This control can be used to set a network access for various - network related activities. The exact nature is dependent on the underlying - usage by the supported QMediaObject. -*/ - -/*! - \internal -*/ -QMediaNetworkAccessControl::QMediaNetworkAccessControl(QObject *parent) : - QMediaControl(parent) -{ -} - -/*! - Destroys a network access control. -*/ -QMediaNetworkAccessControl::~QMediaNetworkAccessControl() -{ -} - -/*! - \fn void QMediaNetworkAccessControl::setConfigurations(const QList<QNetworkConfiguration> &configurations) - - The \a configurations parameter contains a list of network configurations to be used for network access. - - It is assumed the list is given in highest to lowest preference order. - By calling this function all previous configurations will be invalidated - and replaced with the new list. -*/ - -/*! - \fn QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration() const - - Returns the current active configuration in use. - A default constructed QNetworkConfigration is returned if no user supplied configuration are in use. -*/ - - -/*! - \fn QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) - - This signal is emitted when the current active network configuration changes - to \a configuration. -*/ - -QT_END_NAMESPACE - -#include "moc_qmedianetworkaccesscontrol.cpp" diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h deleted file mode 100644 index 0c14961cf..000000000 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef QMEDIANETWORKACCESSCONTROL_H -#define QMEDIANETWORKACCESSCONTROL_H - -#if 0 -#pragma qt_class(QMediaNetworkAccessControl) -#endif - -#include <QtMultimedia/qmediacontrol.h> - -#include <QtCore/qlist.h> -#include <QtNetwork/qnetworkconfiguration.h> - -QT_BEGIN_NAMESPACE - -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - -// Required for QDoc workaround -class QString; -class QT_DEPRECATED_VERSION_5_15 Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl -{ - Q_OBJECT -public: - - virtual ~QMediaNetworkAccessControl(); - - virtual void setConfigurations(const QList<QNetworkConfiguration> &configuration) = 0; - virtual QNetworkConfiguration currentConfiguration() const = 0; - -Q_SIGNALS: - void configurationChanged(const QNetworkConfiguration& configuration); - -protected: - explicit QMediaNetworkAccessControl(QObject *parent = nullptr); -}; - -#define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_iid) - -QT_WARNING_POP - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 3773cfe64..e339980a2 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -48,7 +48,6 @@ #include <qmediaplaylist.h> #include <qmediaplaylistcontrol_p.h> #include <qmediaplaylistsourcecontrol_p.h> -#include <qmedianetworkaccesscontrol.h> #include <qaudiorolecontrol.h> #include <qcustomaudiorolecontrol.h> @@ -116,7 +115,6 @@ public: , audioRoleControl(nullptr) , customAudioRoleControl(nullptr) , playlist(nullptr) - , networkAccessControl(nullptr) , state(QMediaPlayer::StoppedState) , status(QMediaPlayer::UnknownMediaStatus) , error(QMediaPlayer::NoError) @@ -133,7 +131,6 @@ public: QPointer<QObject> videoOutput; QMediaPlaylist *playlist; - QMediaNetworkAccessControl *networkAccessControl; QVideoSurfaceOutput surfaceOutput; QMediaContent qrcMedia; QScopedPointer<QFile> qrcFile; @@ -599,7 +596,6 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): d->error = ServiceMissingError; } else { d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid)); - d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid)); if (d->control != nullptr) { connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent))); connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State))); @@ -643,10 +639,6 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): } } } - if (d->networkAccessControl != nullptr) { - connect(d->networkAccessControl, &QMediaNetworkAccessControl::configurationChanged, - this, &QMediaPlayer::networkConfigurationChanged); - } } } @@ -731,23 +723,6 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist) setMedia(m); } -/*! - \obsolete - - Sets the network access points for remote media playback. - \a configurations contains, in ascending preferential order, a list of - configuration that can be used for network access. - - This will invalidate the choice of previous configurations. -*/ -void QMediaPlayer::setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations) -{ - Q_D(QMediaPlayer); - - if (d->networkAccessControl) - d->networkAccessControl->setConfigurations(configurations); -} - QMediaPlayer::State QMediaPlayer::state() const { Q_D(const QMediaPlayer); @@ -872,24 +847,6 @@ QString QMediaPlayer::errorString() const return d_func()->errorString; } -/*! - \obsolete - - Returns the current network access point in use. - If a default contructed QNetworkConfiguration is returned - this feature is not available or that none of the - current supplied configurations are in use. -*/ -QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() const -{ - Q_D(const QMediaPlayer); - - if (d->networkAccessControl) - return d_func()->networkAccessControl->currentConfiguration(); - - return QNetworkConfiguration(); -} - //public Q_SLOTS: /*! Start or resume playing the current source. @@ -1667,13 +1624,6 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const */ /*! - \fn void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) - \obsolete - - Signal that the active in use network access point has been changed to \a configuration and all subsequent network access will use this \a configuration. -*/ - -/*! \enum QMediaPlayer::Flag \value LowLatency The player is expected to be used with simple audio formats, diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index bd070328b..decc61511 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -46,8 +46,6 @@ #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> -#include <QtNetwork/qnetworkconfiguration.h> - QT_BEGIN_NAMESPACE @@ -158,11 +156,6 @@ public: Error error() const; QString errorString() const; -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration currentNetworkConfiguration() const; -QT_WARNING_POP - QMultimedia::AvailabilityStatus availability() const override; QAudio::Role audioRole() const; @@ -186,15 +179,6 @@ public Q_SLOTS: void setMedia(const QMediaContent &media, QIODevice *stream = nullptr); void setPlaylist(QMediaPlaylist *playlist); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#endif - QT_DEPRECATED_VERSION_5_15 void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_POP -#endif - Q_SIGNALS: void mediaChanged(const QMediaContent &media); void currentMediaChanged(const QMediaContent &media); @@ -220,14 +204,6 @@ Q_SIGNALS: void error(QMediaPlayer::Error error); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#endif - QT_DEPRECATED_VERSION_5_15 void networkConfigurationChanged(const QNetworkConfiguration &configuration); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_POP -#endif public: bool bind(QObject *) override; void unbind(QObject *) override; diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index f2b993722..ed2a9dd42 100644 --- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp @@ -32,8 +32,6 @@ #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> -#include <QtNetwork/qnetworkconfiguration.h> -#include <QtNetwork/qnetworkconfigmanager.h> #include <qabstractvideosurface.h> #include <qmediaplayer.h> @@ -41,7 +39,6 @@ #include <qmediaplaylist.h> #include <qmediaservice.h> #include <qmediastreamscontrol.h> -#include <qmedianetworkaccesscontrol.h> #include <qvideorenderercontrol.h> #include "mockmediaserviceprovider.h" @@ -118,9 +115,6 @@ private slots: void testMediaStatus_data(); void testMediaStatus(); void testPlaylist(); -#ifndef QT_NO_BEARERMANAGEMENT - void testNetworkAccess(); -#endif void testSetVideoOutput(); void testSetVideoOutputNoService(); void testSetVideoOutputNoControl(); @@ -1066,36 +1060,6 @@ void tst_QMediaPlayer::testDestructor() mockProvider->deleteServiceOnRelease = false; } -#ifndef QT_NO_BEARERMANAGEMENT -void tst_QMediaPlayer::testNetworkAccess() -{ - QNetworkConfigurationManager manager; - QList<QNetworkConfiguration> configs = manager.allConfigurations(); - - if (configs.count() >= 1) { - QSignalSpy spy(player, SIGNAL(networkConfigurationChanged(QNetworkConfiguration))); - int index = qFloor((configs.count())/2); - player->setNetworkConfigurations(configs); - mockService->selectCurrentConfiguration(configs.at(index)); - - QVERIFY(spy.count() == 1); - QList<QVariant> args = spy.takeFirst(); - QNetworkConfiguration config = args.at(0).value<QNetworkConfiguration>(); - QCOMPARE(config.identifier() , configs.at(index).identifier()); - QCOMPARE(player->currentNetworkConfiguration().identifier() , config.identifier()); - } - - // invalidate current network configuration - QSignalSpy spy(player, SIGNAL(networkConfigurationChanged(QNetworkConfiguration))); - mockService->selectCurrentConfiguration(QNetworkConfiguration()); - QVERIFY(spy.count() == 1); - QList<QVariant> args = spy.takeFirst(); - QNetworkConfiguration config = args.at(0).value<QNetworkConfiguration>(); - QVERIFY(config.isValid() == false); - QVERIFY(player->currentNetworkConfiguration().isValid() == false); -} -#endif - void tst_QMediaPlayer::testSetVideoOutput() { MockVideoSurface surface; diff --git a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp index 389100771..1e6a714fb 100644 --- a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp +++ b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp @@ -31,7 +31,6 @@ #include <QtTest/QtTest> #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> -#include <QtNetwork/qnetworkconfiguration.h> #include <qgraphicsvideoitem.h> #include <qabstractvideosurface.h> diff --git a/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h b/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h deleted file mode 100644 index 4fb76cb28..000000000 --- a/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOCKMEDIANETWORKACCESSCONTROL_H -#define MOCKMEDIANETWORKACCESSCONTROL_H - -#include "qmedianetworkaccesscontrol.h" -#include "qnetworkconfiguration.h" - -class MockNetworkAccessControl : public QMediaNetworkAccessControl -{ - friend class MockMediaPlayerService; - -public: - MockNetworkAccessControl() {} - ~MockNetworkAccessControl() {} - - void setConfigurations(const QList<QNetworkConfiguration> &configurations) - { - _configurations = configurations; - _current = QNetworkConfiguration(); - } - - QNetworkConfiguration currentConfiguration() const - { - return _current; - } - -private: - void setCurrentConfiguration(QNetworkConfiguration configuration) - { - if (_configurations.contains(configuration)) - emit configurationChanged(_current = configuration); - else - emit configurationChanged(_current = QNetworkConfiguration()); - } - - QList<QNetworkConfiguration> _configurations; - QNetworkConfiguration _current; -}; - - - -#endif // MOCKMEDIANETWORKACCESSCONTROL_H diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h b/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h index 068bb84a9..62f9c542e 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h @@ -33,7 +33,6 @@ #include "mockmediaplayercontrol.h" #include "mockmediastreamscontrol.h" -#include "mockmedianetworkaccesscontrol.h" #include "mockvideorenderercontrol.h" #include "mockvideoprobecontrol.h" #include "mockvideowindowcontrol.h" @@ -51,7 +50,6 @@ public: mockAudioRoleControl = new MockAudioRoleControl; mockCustomAudioRoleControl = new MockCustomAudioRoleControl; mockStreamsControl = new MockStreamsControl; - mockNetworkControl = new MockNetworkAccessControl; rendererControl = new MockVideoRendererControl; rendererRef = 0; mockVideoProbeControl = new MockVideoProbeControl; @@ -67,7 +65,6 @@ public: delete mockAudioRoleControl; delete mockCustomAudioRoleControl; delete mockStreamsControl; - delete mockNetworkControl; delete rendererControl; delete mockVideoProbeControl; delete windowControl; @@ -96,8 +93,6 @@ public: return mockCustomAudioRoleControl; } - if (qstrcmp(iid, QMediaNetworkAccessControl_iid) == 0) - return mockNetworkControl; return 0; } @@ -130,8 +125,6 @@ public: void setError(QMediaPlayer::Error error) { mockControl->_error = error; emit mockControl->error(mockControl->_error, mockControl->_errorString); } void setErrorString(QString errorString) { mockControl->_errorString = errorString; emit mockControl->error(mockControl->_error, mockControl->_errorString); } - void selectCurrentConfiguration(QNetworkConfiguration config) { mockNetworkControl->setCurrentConfiguration(config); } - void setHasAudioRole(bool enable) { enableAudioRole = enable; } void setHasCustomAudioRole(bool enable) { enableCustomAudioRole = enable; } @@ -157,16 +150,12 @@ public: mockAudioRoleControl->m_audioRole = QAudio::UnknownRole; enableCustomAudioRole = true; mockCustomAudioRoleControl->m_customAudioRole.clear(); - - mockNetworkControl->_current = QNetworkConfiguration(); - mockNetworkControl->_configurations = QList<QNetworkConfiguration>(); } MockMediaPlayerControl *mockControl; MockAudioRoleControl *mockAudioRoleControl; MockCustomAudioRoleControl *mockCustomAudioRoleControl; MockStreamsControl *mockStreamsControl; - MockNetworkAccessControl *mockNetworkControl; MockVideoRendererControl *rendererControl; MockVideoProbeControl *mockVideoProbeControl; MockVideoWindowControl *windowControl; |