QT: Add entries from .m3u files to change disc menu

Author: nfriedly

pcsx2-qt/MainWindow.cpp

@@ -49,6 +49,7 @@
 
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtGui/QCloseEvent>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QInputDialog>
@@ -1687,11 +1688,37 @@ void MainWindow::onRemoveDiscActionTriggered()
 
 void MainWindow::onChangeDiscMenuAboutToShow()
 {
-	// TODO: This is where we would populate the playlist if there is one.
+	const std::vector<std::string>& playlist = VMManager::GetM3UPlaylistEntries();
+	if (playlist.empty())
+		return;
+
+	m_change_disc_playlist_actions.clear();
+	m_change_disc_playlist_actions.append(m_ui.menuChangeDisc->addSeparator());
+
+	const int active_index = VMManager::GetM3UPlaylistCurrentIndex();
+	for (int i = 0; i < static_cast<int>(playlist.size()); ++i)
+	{
+		const QString label = tr("%1: %2").arg(i + 1).arg(QFileInfo(QString::fromStdString(playlist[i])).fileName());
+		QAction* action = m_ui.menuChangeDisc->addAction(label);
+		action->setCheckable(true);
+		action->setChecked(i == active_index);
+		action->setToolTip(QString::fromStdString(playlist[i]));
+		const std::string target_path = playlist[i];
+		connect(action, &QAction::triggered, this, [target_path]() {
+			g_emu_thread->changeDisc(CDVD_SourceType::Iso, QString::fromStdString(target_path));
+		});
+		m_change_disc_playlist_actions.append(action);
+	}
 }
 
 void MainWindow::onChangeDiscMenuAboutToHide()
 {
+	for (QAction* action : m_change_disc_playlist_actions)
+	{
+		m_ui.menuChangeDisc->removeAction(action);
+		action->deleteLater();
+	}
+	m_change_disc_playlist_actions.clear();
 }
 
 void MainWindow::onLoadStateMenuAboutToShow()

pcsx2-qt/MainWindow.h

@@ -306,6 +306,8 @@ private Q_SLOTS:
 	InputRecordingViewer* m_input_recording_viewer = nullptr;
 	AutoUpdaterDialog* m_auto_updater_dialog = nullptr;
 
+	QList<QAction*> m_change_disc_playlist_actions;
+
 	QProgressBar* m_status_progress_widget = nullptr;
 	QLabel* m_status_verbose_widget = nullptr;
 	QLabel* m_status_renderer_widget = nullptr;

pcsx2/VMManager.cpp

@@ -1236,6 +1236,37 @@ bool VMManager::HasBootedELF()
 	return s_current_crc != 0 && s_elf_executed;
 }
 
+static std::string s_current_m3u_playlist_source;
+static std::vector<std::string> s_current_m3u_playlist_entries;
+static int s_current_m3u_playlist_index = -1;
+
+static void ClearM3UPlaylist()
+{
+	s_current_m3u_playlist_source.clear();
+	s_current_m3u_playlist_entries.clear();
+	s_current_m3u_playlist_index = -1;
+}
+
+static void SetM3UPlaylist(const std::string& m3u_path, std::vector<std::string> entries, int current_index)
+{
+	s_current_m3u_playlist_source = m3u_path;
+	s_current_m3u_playlist_entries = std::move(entries);
+	s_current_m3u_playlist_index = current_index;
+}
+
+static void UpdateM3UPlaylistCurrentIndex(const std::string& current_disc_path)
+{
+	s_current_m3u_playlist_index = -1;
+	for (size_t i = 0; i < s_current_m3u_playlist_entries.size(); ++i)
+	{
+		if (s_current_m3u_playlist_entries[i] == current_disc_path)
+		{
+			s_current_m3u_playlist_index = static_cast<int>(i);
+			return;
+		}
+	}
+}
+
 static std::vector<std::string> ParseM3UPlaylist(const std::string& m3u_path)
 {
 	std::vector<std::string> disc_paths;
@@ -1273,14 +1304,15 @@ static std::vector<std::string> ParseM3UPlaylist(const std::string& m3u_path)
 
 bool VMManager::AutoDetectSource(const std::string& filename, Error* error)
 {
+	ClearM3UPlaylist();
 	if (!filename.empty())
 	{
 		if (!FileSystem::FileExists(filename.c_str()))
 		{
 			Error::SetStringFmt(error, TRANSLATE_FS("VMManager", "Requested filename '{}' does not exist."), filename);
 			return false;
 		}
-
+		
 		if (IsGSDumpFileName(filename))
 		{
 			CDVDsys_ChangeSource(CDVD_SourceType::NoDisc);
@@ -1313,8 +1345,8 @@ bool VMManager::AutoDetectSource(const std::string& filename, Error* error)
 				return false;
 			}
 
-			// For now, just load the first disc
-			CDVDsys_SetFile(CDVD_SourceType::Iso, disc_paths[0]);
+			SetM3UPlaylist(filename, disc_paths, 0);
+			CDVDsys_SetFile(CDVD_SourceType::Iso, s_current_m3u_playlist_entries[0]);
 			CDVDsys_ChangeSource(CDVD_SourceType::Iso);
 			return true;
 		}
@@ -2367,6 +2399,28 @@ bool VMManager::ChangeDisc(CDVD_SourceType source, std::string path)
 	const CDVD_SourceType old_type = CDVDsys_GetSourceType();
 	const std::string old_path(CDVDsys_GetFile(old_type));
 
+	if (source == CDVD_SourceType::Iso && StringUtil::EndsWithNoCase(path, ".m3u"))
+	{
+		const std::vector<std::string> disc_paths = ParseM3UPlaylist(path);
+		if (disc_paths.empty())
+		{
+			return false;
+		}
+
+		SetM3UPlaylist(path, disc_paths, 0);
+		path = s_current_m3u_playlist_entries[0];
+	}
+	else if (source != CDVD_SourceType::Iso)
+	{
+		ClearM3UPlaylist();
+	}
+	else if (!path.empty())
+	{
+		UpdateM3UPlaylistCurrentIndex(path);
+		if (s_current_m3u_playlist_index < 0)
+			ClearM3UPlaylist();
+	}
+
 	CDVDsys_ChangeSource(source);
 	if (!path.empty())
 		CDVDsys_SetFile(source, path);
@@ -2421,6 +2475,16 @@ bool VMManager::ChangeDisc(CDVD_SourceType source, std::string path)
 	return result;
 }
 
+const std::vector<std::string>& VMManager::GetM3UPlaylistEntries()
+{
+	return s_current_m3u_playlist_entries;
+}
+
+int VMManager::GetM3UPlaylistCurrentIndex()
+{
+	return s_current_m3u_playlist_index;
+}
+
 bool VMManager::SetELFOverride(std::string path)
 {
 	if (!HasValidVM() || (!path.empty() && !FileSystem::FileExists(path.c_str())))

pcsx2/VMManager.h

@@ -89,6 +89,12 @@ namespace VMManager
 	/// Returns the path of the disc currently running.
 	std::string GetDiscPath();
 
+	/// Returns the list of disc paths from the currently loaded M3U playlist.
+	const std::vector<std::string>& GetM3UPlaylistEntries();
+
+	/// Returns the current selected disc index for the loaded M3U playlist, or -1 if none.
+	int GetM3UPlaylistCurrentIndex();
+
 	/// Returns the serial of the disc currently running.
 	std::string GetDiscSerial();