Merge branch 'master' into codegen_updates

Author: jpd002

GameConfig.xml

@@ -75,6 +75,9 @@
 	<GameConfig Executable="SLUS_216.09;1" Title="Dance Dance Revolution: Disney Channel Edition">
 		<IdleLoopBlock Address="0x001B48D8" />
 	</GameConfig>
+	<GameConfig Executable="SLUS_216.15;1" Title="Wild Arms 5">
+		<IdleLoopBlock Address="0x001324D8" />
+	</GameConfig>
 	<GameConfig Executable="SLUS_216.91;1" Title="Swashbucklers: Blue vs. Grey">
 		<IdleLoopBlock Address="0x0022FC70" />
 	</GameConfig>

README.md

@@ -1,6 +1,8 @@
 # Play! #
 Play! is a PlayStation2 emulator for Windows, macOS, UNIX, Android, iOS & web browser platforms.
 
+Play! uses a built-in high-level emulation BIOS. Using an external BIOS file is not necessary or possible.
+
 Compatibility information is available on the official [Compatibility Tracker](https://github.com/jpd002/Play-Compatibility).
 If a specific game doesn't work with the emulator, please create a new issue there.
 

Source/ui_qt/ControllerConfig/controllerconfigdialog.cpp

@@ -170,13 +170,16 @@ void ControllerConfigDialog::bindingsViewDoubleClicked(const QModelIndex& index)
 	uint32 padIndex = ui->tabWidget->currentIndex();
 	assert(padIndex < CInputBindingManager::MAX_PADS);
 	OpenBindConfigDialog(padIndex, index.row());
+	auto& bindingsView = m_padUiElements[padIndex].bindingsView;
+	static_cast<CInputBindingModel*>(bindingsView->model())->RefreshRow(index);
 }
 
 void ControllerConfigDialog::bindingsViewDeleteItem()
 {
 	uint32 padIndex = ui->tabWidget->currentIndex();
 	assert(padIndex < CInputBindingManager::MAX_PADS);
-	QItemSelectionModel* selModel = m_padUiElements[padIndex].bindingsView->selectionModel();
+	auto& bindingsView = m_padUiElements[padIndex].bindingsView;
+	QItemSelectionModel* selModel = bindingsView->selectionModel();
 	auto selRows = selModel->selectedRows();
 	if(selRows.empty())
 	{
@@ -189,6 +192,7 @@ void ControllerConfigDialog::bindingsViewDeleteItem()
 		for(const auto& selRow : selRows)
 		{
 			m_inputManager->ResetBinding(padIndex, static_cast<PS2::CControllerInfo::BUTTON>(selRow.row()));
+			static_cast<CInputBindingModel*>(bindingsView->model())->RefreshRow(selRow);
 		}
 	}
 }

Source/ui_qt/ControllerConfig/inputbindingmodel.cpp

@@ -78,3 +78,8 @@ void CInputBindingModel::Refresh()
 {
 	QAbstractTableModel::layoutChanged();
 }
+
+void CInputBindingModel::RefreshRow(const QModelIndex& modelIndex)
+{
+	emit QAbstractTableModel::dataChanged(index(modelIndex.row(), 0), index(modelIndex.row(), columnCount()));
+}

Source/ui_qt/ControllerConfig/inputbindingmodel.h

@@ -15,9 +15,9 @@ class CInputBindingModel : public QAbstractTableModel
 	int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 	int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 	QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-	void addData(const QStringList data) const;
 	bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
 	void Refresh();
+	void RefreshRow(const QModelIndex&);
 
 protected:
 	QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;

Source/ui_qt/VfsDevice.h

@@ -14,7 +14,7 @@ class CDevice
 	virtual bool RequestModification(QWidget*) = 0;
 	virtual void Save() = 0;
 };
-typedef std::map<unsigned int, CDevice*> DeviceList;
+typedef std::map<unsigned int, std::unique_ptr<CDevice>> DeviceList;
 
 class CDirectoryDevice : public CDevice
 {
@@ -29,8 +29,8 @@ class CDirectoryDevice : public CDevice
 	void Save() override;
 
 private:
-	const char* m_name;
-	const char* m_preference;
+	const char* m_name = nullptr;
+	const char* m_preference = nullptr;
 	fs::path m_value;
 };
 

Source/ui_qt/vfsmodel.cpp

@@ -8,14 +8,6 @@ VFSModel::VFSModel(QObject* parent)
 	SetupDevices();
 }
 
-VFSModel::~VFSModel()
-{
-	for(int i = 0; i < m_devices.size(); i++)
-	{
-		delete m_devices.at(i);
-	}
-}
-
 int VFSModel::rowCount(const QModelIndex& /*parent*/) const
 {
 	return m_devices.size();
@@ -30,7 +22,7 @@ QVariant VFSModel::data(const QModelIndex& index, int role) const
 {
 	if(role == Qt::DisplayRole)
 	{
-		auto device = m_devices.at(index.row());
+		const auto& device = m_devices.at(index.row());
 		QString val;
 		switch(index.column())
 		{
@@ -51,11 +43,11 @@ QVariant VFSModel::data(const QModelIndex& index, int role) const
 
 void VFSModel::SetupDevices()
 {
-	m_devices[0] = new CDirectoryDevice("mc0", PREF_PS2_MC0_DIRECTORY);
-	m_devices[1] = new CDirectoryDevice("mc1", PREF_PS2_MC1_DIRECTORY);
-	m_devices[2] = new CDirectoryDevice("host", PREF_PS2_HOST_DIRECTORY);
-	m_devices[3] = new CCdrom0Device();
-	m_devices[4] = new CDirectoryDevice("rom0", PREF_PS2_ROM0_DIRECTORY);
+	m_devices[0] = std::make_unique<CDirectoryDevice>("mc0", PREF_PS2_MC0_DIRECTORY);
+	m_devices[1] = std::make_unique<CDirectoryDevice>("mc1", PREF_PS2_MC1_DIRECTORY);
+	m_devices[2] = std::make_unique<CDirectoryDevice>("host", PREF_PS2_HOST_DIRECTORY);
+	m_devices[3] = std::make_unique<CCdrom0Device>();
+	m_devices[4] = std::make_unique<CDirectoryDevice>("rom0", PREF_PS2_ROM0_DIRECTORY);
 }
 
 bool VFSModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role)
@@ -87,10 +79,11 @@ QVariant VFSModel::headerData(int section, Qt::Orientation orientation, int role
 	return QAbstractTableModel::headerData(section, orientation, role);
 }
 
-void VFSModel::DoubleClicked(const QModelIndex& index, QWidget* parent)
+void VFSModel::DoubleClicked(const QModelIndex& modelIndex, QWidget* parent)
 {
-	CDevice* m_device = m_devices.at(index.row());
-	m_device->RequestModification(parent);
+	const auto& device = m_devices.at(modelIndex.row());
+	device->RequestModification(parent);
+	emit QAbstractTableModel::dataChanged(index(modelIndex.row(), 0), index(modelIndex.row(), columnCount()));
 }
 
 void VFSModel::Save()

Source/ui_qt/vfsmodel.h

@@ -8,12 +8,11 @@ class VFSModel : public QAbstractTableModel
 	Q_OBJECT
 public:
 	VFSModel(QObject* parent);
-	~VFSModel();
+	virtual ~VFSModel() = default;
 
 	int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 	int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 	QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-	void addData(const QStringList data) const;
 	bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
 	void DoubleClicked(const QModelIndex& index, QWidget* parent = nullptr);
 	void Save();

build_cmake/generate_vs2022_64.cmd

@@ -1,2 +1,2 @@
 @echo off
-cmake .. --preset windows-x86_64-vs -DCMAKE_PREFIX_PATH="C:\Qt\6.8.0\msvc2022_64"
+cmake .. --preset windows-x86_64-vs -DCMAKE_PREFIX_PATH="C:\Qt\6.10.2\msvc2022_64" --fresh

build_cmake/generate_vs2022_64_debugger.cmd

@@ -1,2 +1,2 @@
 @echo off
-cmake .. --preset windows-debugger-x86_64-vs -DCMAKE_PREFIX_PATH="C:\Qt\6.8.0\msvc2022_64"
+cmake .. --preset windows-debugger-x86_64-vs -DCMAKE_PREFIX_PATH="C:\Qt\6.10.2\msvc2022_64" --fresh