MythMainWindow: Convert 'MPData' to QPair

MythTV · Apr 16, 2020 · b69dda6 · b69dda6
1 parent caa0fe6
commit b69dda6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -1627,8 +1627,7 @@ void MythMainWindow::RegisterMediaPlugin(const QString &name,
     {
         LOG(VB_GENERAL, LOG_NOTICE,
             QString("Registering %1 as a media playback plugin.").arg(name));
-        MPData mpd = {desc, fn};
-        d->m_mediaPluginMap[name] = mpd;
+        d->m_mediaPluginMap[name] = { desc, fn };
     }
     else
     {
@@ -1653,10 +1652,10 @@ bool MythMainWindow::HandleMedia(const QString &handler, const QString &mrl,
     // Let's see if we have a plugin that matches the handler name...
     if (d->m_mediaPluginMap.count(lhandler))
     {
-        d->m_mediaPluginMap[lhandler].m_playFn(mrl, plot, title, subtitle,
-                                           director, season, episode,
-                                           inetref, lenMins, year, id,
-                                           useBookmarks);
+        d->m_mediaPluginMap[lhandler].second(mrl, plot, title, subtitle,
+                                             director, season, episode,
+                                             inetref, lenMins, year, id,
+                                             useBookmarks);
         return true;
     }
 

diff --git a/mythtv/libs/libmythui/mythmainwindowprivate.h b/mythtv/libs/libmythui/mythmainwindowprivate.h
@@ -61,11 +61,7 @@ struct JumpData
     QString m_localAction;
 };
 
-// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
-struct MPData {
-    QString           m_description;
-    MediaPlayCallback m_playFn;
-};
+using MythMediaCallback = QPair<QString, MediaPlayCallback>;
 
 class MythMainWindowPrivate
 {
@@ -104,7 +100,7 @@ class MythMainWindowPrivate
     QHash<QString, KeyContext *> m_keyContexts;
     QMap<int, JumpData*> m_jumpMap;
     QMap<QString, JumpData> m_destinationMap;
-    QMap<QString, MPData> m_mediaPluginMap;
+    QMap<QString, MythMediaCallback> m_mediaPluginMap;
     QHash<QString, QHash<QString, QString> > m_actionText;
 
     void (*m_exitMenuCallback)(void) { nullptr };