Get rid of QMediaPlayer::setCustomRole() and related

setAudioRole should be enough here. And if more roles
are required, let's rather extend the enum.

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

3 files changed, 0 insertions, 13 deletions

diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp
index cc4418a1d..49c82d877 100644
--- a/examples/multimediawidgets/player/main.cpp
+++ b/examples/multimediawidgets/player/main.cpp
@@ -64,21 +64,14 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("QtProject");
     QCoreApplication::setApplicationVersion(QT_VERSION_STR);
     QCommandLineParser parser;
-    QCommandLineOption customAudioRoleOption("custom-audio-role",
-                                             "Set a custom audio role for the player.",
-                                             "role");
     parser.setApplicationDescription("Qt MultiMedia Player Example");
     parser.addHelpOption();
     parser.addVersionOption();
-    parser.addOption(customAudioRoleOption);
     parser.addPositionalArgument("url", "The URL(s) to open.");
     parser.process(app);
 
     Player player;
 
-    if (parser.isSet(customAudioRoleOption))
-        player.setCustomAudioRole(parser.value(customAudioRoleOption));
-
     if (!parser.positionalArguments().isEmpty() && player.isPlayerAvailable()) {
         QList<QUrl> urls;
         for (auto &a: parser.positionalArguments())
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index 3612c49c9..fbdac1263 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -284,11 +284,6 @@ void Player::addToPlaylist(const QList<QUrl> &urls)
     }
 }
 
-void Player::setCustomAudioRole(const QString &role)
-{
-    m_player->setCustomAudioRole(role);
-}
-
 void Player::durationChanged(qint64 duration)
 {
     m_duration = duration / 1000;
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index 7385d27a9..9ccecb891 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -82,7 +82,6 @@ public:
     bool isPlayerAvailable() const;
 
     void addToPlaylist(const QList<QUrl> &urls);
-    void setCustomAudioRole(const QString &role);
 
 signals:
     void fullScreenChanged(bool fullScreen);