AHAHAHAHAAHAHAHAHAH

RPCS3 · Aug 22, 2017 · 7f8346c · 7f8346c
1 parent 387cbf1
commit 7f8346c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/rpcs3/pad_thread.cpp b/rpcs3/pad_thread.cpp
@@ -87,11 +87,11 @@ void pad_thread::Init(const u32 max_connect)
 			CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_ACTUATOR,
 			CELL_PAD_DEV_TYPE_STANDARD
 		);
-		if (cur_pad_handler->bindPadToDevice(&m_pads.back(), input_cfg.player_device[i].to_string()) == false)
+		if (cur_pad_handler->bindPadToDevice(&m_pads.back(), input_cfg.player_device[i]->to_string()) == false)
 		{
 			//Failed to bind the device to cur_pad_handler so binds to NullPadHandler
-			LOG_ERROR(GENERAL, "Failed to bind device %s to handler %s", input_cfg.player_device[i].to_string(), input_cfg.player_input[i].to_string());
-			nullpad->bindPadToDevice(&m_pads.back(), input_cfg.player_device[i].to_string());
+			LOG_ERROR(GENERAL, "Failed to bind device %s to handler %s", input_cfg.player_device[i]->to_string(), input_cfg.player_input[i].to_string());
+			nullpad->bindPadToDevice(&m_pads.back(), input_cfg.player_device[i]->to_string());
 		}
 	}
 

diff --git a/rpcs3/rpcs3qt/gamepads_settings_dialog.cpp b/rpcs3/rpcs3qt/gamepads_settings_dialog.cpp
@@ -102,7 +102,7 @@ gamepads_settings_dialog::gamepads_settings_dialog(QWidget* parent)
 
 		for (int j = 0; j < co_deviceID[i]->count(); j++)
 		{
-			if (co_deviceID[i]->itemText(j).toStdString() == input_cfg.player_device[i].to_string())
+			if (co_deviceID[i]->itemText(j).toStdString() == input_cfg.player_device[i]->to_string())
 			{
 				co_deviceID[i]->setCurrentIndex(j);
 				ChangeDevice(i);
@@ -120,7 +120,7 @@ void gamepads_settings_dialog::SaveExit()
 		if (co_deviceID[i]->currentData() == -1)
 		{
 			input_cfg.player_input[i].from_default();
-			input_cfg.player_device[i].from_default();
+			input_cfg.player_device[i]->from_default();
 		}
 	}
 
@@ -142,7 +142,7 @@ void gamepads_settings_dialog::ChangeDevice(int player)
 {
 	bool success;
 
-	success = input_cfg.player_device[player].from_string(co_deviceID[player]->currentText().toStdString());
+	success = input_cfg.player_device[player]->from_string(co_deviceID[player]->currentText().toStdString());
 
 	if (!success)
 	{
@@ -219,5 +219,5 @@ void gamepads_settings_dialog::ChangeInputType(int player)
 void gamepads_settings_dialog::ClickConfigButton(int player)
 {
 	std::shared_ptr<PadHandlerBase> cur_pad_handler = GetHandler(input_cfg.player_input[player]);
-	if (cur_pad_handler->has_config()) cur_pad_handler->ConfigController(input_cfg.player_device[player]);
+	if (cur_pad_handler->has_config()) cur_pad_handler->ConfigController(*input_cfg.player_device[player]);
 }
diff --git a/rpcs3/rpcs3qt/gamepads_settings_dialog.h b/rpcs3/rpcs3qt/gamepads_settings_dialog.h
@@ -15,7 +15,7 @@ struct input_config final : cfg::node
 {
 	const std::string cfg_name = fs::get_config_dir() + "/config_input.yml";
 
-	cfg::_enum<pad_handler> player_input[7] {
+	cfg::_enum<pad_handler> player_input[7]{
 		{ this, "Player 1 Input", pad_handler::keyboard },
 		{ this, "Player 2 Input", pad_handler::null },
 		{ this, "Player 3 Input", pad_handler::null },
@@ -24,14 +24,24 @@ struct input_config final : cfg::node
 		{ this, "Player 6 Input", pad_handler::null },
 		{ this, "Player 7 Input", pad_handler::null } };
 
-	cfg::string player_device[7] {
-		{ this, "Player 1 Device", "Keyboard" },
-		{ this, "Player 2 Device", "Default Null Device" },
-		{ this, "Player 3 Device", "Default Null Device" },
-		{ this, "Player 4 Device", "Default Null Device" },
-		{ this, "Player 5 Device", "Default Null Device" },
-		{ this, "Player 6 Device", "Default Null Device" },
-		{ this, "Player 7 Device", "Default Null Device" } };
+	cfg::string player1{ this, "Player 1 Device", "Keyboard" };
+	cfg::string player2{ this, "Player 2 Device", "Default Null Device" };
+	cfg::string player3{ this, "Player 3 Device", "Default Null Device" };
+	cfg::string player4{ this, "Player 4 Device", "Default Null Device" };
+	cfg::string player5{ this, "Player 5 Device", "Default Null Device" };
+	cfg::string player6{ this, "Player 6 Device", "Default Null Device" };
+	cfg::string player7{ this, "Player 7 Device", "Default Null Device" };
+
+	cfg::string *player_device[7]{ &player1, &player2, &player3, &player4, &player5, &player6, &player7 };
+
+	//cfg::string player_device[7] {
+	//	cfg::string a(this, "Player 1 Device", "Keyboard"),
+	//	{ this, "Player 2 Device", "Default Null Device" },
+	//	{ this, "Player 3 Device", "Default Null Device" },
+	//	{ this, "Player 4 Device", "Default Null Device" },
+	//	{ this, "Player 5 Device", "Default Null Device" },
+	//	{ this, "Player 6 Device", "Default Null Device" },
+	//	{ this, "Player 7 Device", "Default Null Device" } };
 
 	bool load()
 	{