Use a struct instead of QPair for track items

Author: tbertels

mainwindow.cpp

@@ -1922,7 +1922,7 @@ void MainWindow::setChapters(QList<Chapter> chapters)
     }
 }
 
-void MainWindow::setAudioTracks(QList<QPair<int64_t, QString>> tracks)
+void MainWindow::setAudioTracks(QList<Track> tracks)
 {
     ui->menuPlayAudio->clear();
     ui->menuPlayAudio->setEnabled(false);
@@ -1932,12 +1932,12 @@ void MainWindow::setAudioTracks(QList<QPair<int64_t, QString>> tracks)
         return;
     ui->menuPlayAudio->setEnabled(true);
     audioTracksGroup = new QActionGroup(this);
-    for (const QPair<int64_t, QString> &track : tracks) {
+    for (const Track &track : tracks) {
         QAction *action = new QAction(this);
-        action->setText(track.second);
+        action->setText(track.title);
         action->setCheckable(true);
         action->setActionGroup(audioTracksGroup);
-        int64_t index = track.first;
+        int64_t index = track.id;
         connect(action, &QAction::triggered, this, [this,index] {
             emit audioTrackSelected(index, true);
         });
@@ -1946,7 +1946,7 @@ void MainWindow::setAudioTracks(QList<QPair<int64_t, QString>> tracks)
     audioTracksGroup->actions()[0]->setChecked(true);
 }
 
-void MainWindow::setVideoTracks(QList<QPair<int64_t, QString>> tracks)
+void MainWindow::setVideoTracks(QList<Track> tracks)
 {
     ui->menuPlayVideo->clear();
     ui->menuPlayVideo->setEnabled(false);
@@ -1961,12 +1961,12 @@ void MainWindow::setVideoTracks(QList<QPair<int64_t, QString>> tracks)
     ui->menuPlayVideo->addAction(ui->actionResetVideoAspect);
     ui->menuPlayVideo->addAction(ui->actionDisableVideoAspect);
     ui->menuPlayVideo->addSeparator();
-    for (const QPair<int64_t, QString> &track : tracks) {
+    for (const Track &track : tracks) {
         QAction *action = new QAction(this);
-        action->setText(track.second);
+        action->setText(track.title);
         action->setCheckable(true);
         action->setActionGroup(videoTracksGroup);
-        int64_t index = track.first;
+        int64_t index = track.id;
         connect(action, &QAction::triggered, this, [this,index]() {
             emit videoTrackSelected(index, true);
         });
@@ -1976,7 +1976,7 @@ void MainWindow::setVideoTracks(QList<QPair<int64_t, QString>> tracks)
     updateOnTop();
 }
 
-void MainWindow::setSubtitleTracks(QList<QPair<int64_t, QString> > tracks)
+void MainWindow::setSubtitleTracks(QList<Track > tracks)
 {
     ui->menuPlaySubtitles->clear();
     ui->menuPlaySubtitles->setEnabled(false);
@@ -1997,12 +1997,12 @@ void MainWindow::setSubtitleTracks(QList<QPair<int64_t, QString> > tracks)
     ui->menuPlaySubtitles->addAction(ui->actionDecreaseSubtitlesDelay);
     ui->menuPlaySubtitles->addAction(ui->actionIncreaseSubtitlesDelay);
     ui->menuPlaySubtitles->addSeparator();
-    for (const QPair<int64_t, QString> &track : tracks) {
+    for (const Track &track : tracks) {
         QAction *action = new QAction(this);
-        action->setText(track.second);
+        action->setText(track.title);
         action->setCheckable(true);
         action->setActionGroup(subtitleTracksGroup);
-        int64_t index = track.first;
+        int64_t index = track.id;
         connect(action, &QAction::triggered, this, [this,index]() {
             emit subtitleTrackSelected(index, true);
         });

mainwindow.h

@@ -251,9 +251,9 @@ public slots:
     void setPlaybackType(PlaybackManager::PlaybackType type);
     void disableChaptersMenus();
     void setChapters(QList<Chapter> chapters);
-    void setAudioTracks(QList<QPair<int64_t,QString>> tracks);
-    void setVideoTracks(QList<QPair<int64_t,QString>> tracks);
-    void setSubtitleTracks(QList<QPair<int64_t,QString>> tracks);
+    void setAudioTracks(QList<Track> tracks);
+    void setVideoTracks(QList<Track> tracks);
+    void setSubtitleTracks(QList<Track> tracks);
     void audioTrackSet(int64_t id);
     void videoTrackSet(int64_t id);
     void subtitleTrackSet(int64_t id);

manager.cpp

@@ -869,22 +869,21 @@ void PlaybackManager::mpvw_tracksChanged(QVariantList tracks)
     audioListData.clear();
     subtitleList.clear();
     subtitleListData.clear();
-    QPair<int64_t,QString> item;
+    Track track;
 
-    for (QVariant &track : tracks) {
-        QVariantMap t = track.toMap();
-        TrackData td = TrackData::fromMap(t);
-        item.first = td.trackId;
-        item.second = td.formatted();
+    for (QVariant &trackItem : tracks) {
+        TrackData td = TrackData::fromMap(trackItem.toMap());
+        track.id = td.trackId;
+        track.title = td.formatted();
         if (td.type == "video") {
-            videoList.append(item);
+            videoList.append(track);
             videoListData.insert(td.trackId, td);
         } else if (td.type == "audio") {
-            audioList.append(item);
+            audioList.append(track);
             audioListData.insert(td.trackId, td);
         } else if (td.type == "sub") {
             if (!subtitlesIgnoreEmbedded || td.isExternal) {
-                subtitleList.append(item);
+                subtitleList.append(track);
                 subtitleListData.insert(td.trackId, td);
             }
         }

manager.h

@@ -14,6 +14,11 @@
 #include "helpers.h"
 #include "mpvwidget.h"
 
+struct Track {
+    int64_t id;
+    QString title;
+};
+
 class MpvObject;
 class PlaylistWindow;
 
@@ -60,9 +65,9 @@ class PlaybackManager : public QObject
     // Transmit a map of chapter index to time,description pairs
     void chaptersAvailable(QList<Chapter> chapters);
     // These signals transmit a list of (id, description) pairs
-    void audioTracksAvailable(QList<QPair<int64_t,QString>> tracks);
-    void videoTracksAvailable(QList<QPair<int64_t,QString>> tracks);
-    void subtitleTracksAvailable(QList<QPair<int64_t,QString>> tracks);
+    void audioTracksAvailable(QList<Track> tracks);
+    void videoTracksAvailable(QList<Track> tracks);
+    void subtitleTracksAvailable(QList<Track> tracks);
     void playingNextFile();
     void hasNoVideo(bool empty);
     void hasNoAudio(bool empty);
@@ -217,9 +222,9 @@ private slots:
     PlaybackState playbackState_ = StoppedState;
     PlaybackState playbackStartState = PlayingState;
 
-    QList<QPair<int64_t,QString>> videoList;
-    QList<QPair<int64_t,QString>> audioList;
-    QList<QPair<int64_t,QString>> subtitleList;
+    QList<Track> videoList;
+    QList<Track> audioList;
+    QList<Track> subtitleList;
     QMap<int64_t,TrackData> videoListData;
     QMap<int64_t,TrackData> audioListData;
     QMap<int64_t,TrackData> subtitleListData;