From b48b81c9388896694285f898413c9b56436917e4 Mon Sep 17 00:00:00 2001
From: Matthew Budd <mjbudd77@gmail.com>
Date: Fri, 24 Jul 2020 23:04:56 -0400
Subject: [PATCH] Commented out command line INOP inputCfg functionality. With
 new GUI gamepad config, this should not be required anymore.

---
 src/drivers/Qt/config.cpp      |  2 +-
 src/drivers/Qt/fceuWrapper.cpp | 14 +++++++-------
 src/drivers/Qt/input.cpp       | 10 +++++-----
 src/drivers/Qt/input.h         |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/drivers/Qt/config.cpp b/src/drivers/Qt/config.cpp
index 11bbcfea..f0d54880 100644
--- a/src/drivers/Qt/config.cpp
+++ b/src/drivers/Qt/config.cpp
@@ -242,7 +242,7 @@ InitConfig()
 	config->addOption("input4", "SDL.Input.3", "Gamepad.3");
 
 	// allow for input configuration
-	config->addOption('i', "inputcfg", "SDL.InputCfg", InputCfg);
+	//config->addOption('i', "inputcfg", "SDL.InputCfg", InputCfg);
     
 	// display input
 	config->addOption("inputdisplay", "SDL.InputDisplay", 0);
diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp
index b65d723d..0d5f18a7 100644
--- a/src/drivers/Qt/fceuWrapper.cpp
+++ b/src/drivers/Qt/fceuWrapper.cpp
@@ -414,6 +414,7 @@ static void ShowUsage(const char *prog)
 int  fceuWrapperInit( int argc, char *argv[] )
 {
 	int error;
+	std::string s;
 
 	for (int i=0; i<argc; i++)
 	{
@@ -468,15 +469,14 @@ int  fceuWrapperInit( int argc, char *argv[] )
 		g_config->save();
 	}
 
-	std::string s;
 
-	g_config->getOption("SDL.InputCfg", &s);
+	//g_config->getOption("SDL.InputCfg", &s);
 
-	if (s.size() != 0)
-	{
-		InitVideo(GameInfo);
-		InputCfg(s);
-	}
+	//if (s.size() != 0)
+	//{
+	//	InitVideo(GameInfo);
+	//	InputCfg(s);
+	//}
 
 	 // update the input devices
 	UpdateInput(g_config);
diff --git a/src/drivers/Qt/input.cpp b/src/drivers/Qt/input.cpp
index eef69c71..ce2bf93b 100644
--- a/src/drivers/Qt/input.cpp
+++ b/src/drivers/Qt/input.cpp
@@ -1909,9 +1909,9 @@ extern Config *g_config;
 /**
  * Update the button configuration for a device, specified by a text string.
  */
-void InputCfg (const std::string & text)
-{
-
+//void InputCfg (const std::string & text)
+//{
+//
 //	if (noGui)
 //	{
 //		if (text.find ("gamepad") != std::string::npos)
@@ -1947,8 +1947,8 @@ void InputCfg (const std::string & text)
 //	}
 //	else
 //		printf ("Please run \"fceux --nogui\" before using --inputcfg\n");
-
-}
+//
+//}
 
 
 /**
diff --git a/src/drivers/Qt/input.h b/src/drivers/Qt/input.h
index 8fd218d8..07dc1d04 100644
--- a/src/drivers/Qt/input.h
+++ b/src/drivers/Qt/input.h
@@ -59,7 +59,7 @@ int DTestButtonJoy(ButtConfig *bc);
 void FCEUD_UpdateInput(void);
 
 void UpdateInput(Config *config);
-void InputCfg(const std::string &);
+//void InputCfg(const std::string &);
 
 std::string GetUserText(const char* title);
 const char* ButtonName(const ButtConfig* bc);