Merge 1dca84e413 into d70232dcd8

src/config.cpp

@@ -199,7 +199,7 @@ void CConfig::Load (void)
 	m_bMIDIDumpEnabled  = m_Properties.GetNumber ("MIDIDumpEnabled", 0) != 0;
 	m_bProfileEnabled = m_Properties.GetNumber ("ProfileEnabled", 0) != 0;
 	m_bPerformanceSelectToLoad = m_Properties.GetNumber ("PerformanceSelectToLoad", 0) != 0;
-	m_bPerformanceSelectChannel = m_Properties.GetNumber ("PerformanceSelectChannel", 0);
+	m_bPerformanceSelectChannel = m_Properties.GetNumber ("PerformanceSelectChannel", 17);
 	
 	// Network
 	m_bNetworkEnabled  = m_Properties.GetNumber ("NetworkEnabled", 0) != 0;

src/minidexed.cpp

@@ -2327,7 +2327,7 @@ void CMiniDexed::UpdateNetwork()
 			LOGNOTE("FTP daemon not started (NetworkFTPEnabled=0)");
 		}
 
-		m_UI.DisplayWrite (IPString, "", "TG1", 0, 1);
+		m_UI.DisplayWrite (IPString, "", "Performance", 0, 1);
 
 		m_pmDNSPublisher = new CmDNSPublisher (m_pNet);
 		assert (m_pmDNSPublisher);

src/minidexed.ini

@@ -36,7 +36,7 @@ ExpandPCAcrossBanks=1
 #   1-16 = Program Change messages on this channel select performances.
 #   >16 = Program Change messages on ANY channel select performances.
 # NB: In performance mode, all Program Change messages on other channels are ignored.
-PerformanceSelectChannel=0
+PerformanceSelectChannel=17
 
 # HD44780 LCD
 LCDEnabled=1

src/uimenu.cpp

@@ -43,7 +43,8 @@ const CUIMenu::TMenuItem CUIMenu::s_MenuRoot[] =
 // inserting menu items before "TG1" affect TGShortcutHandler()
 const CUIMenu::TMenuItem CUIMenu::s_MainMenu[] =
 {
-	{"TG1",		MenuHandler,	s_TGMenu, 0},
+		{"Performance",	MenuHandler, s_PerformanceMenu},
+		{"TG1",		MenuHandler,	s_TGMenu, 0},
 #ifdef ARM_ALLOW_MULTI_CORE
 	{"TG2",		MenuHandler,	s_TGMenu, 1},
 	{"TG3",		MenuHandler,	s_TGMenu, 2},
@@ -65,7 +66,6 @@ const CUIMenu::TMenuItem CUIMenu::s_MainMenu[] =
 #endif
 	{"Effects",	MenuHandler,	s_EffectsMenu},
 	{"Master Volume", EditMasterVolume, 0, 0},
-	{"Performance",	MenuHandler, s_PerformanceMenu}, 
 	{0}
 };
 
@@ -1239,11 +1239,12 @@ string CUIMenu::ToPolyMono (int nValue)
 
 void CUIMenu::TGShortcutHandler (TMenuEvent Event)
 {
+	int nMenuItemsBeforeTG1 = 1; // Adjust for TG1 being the second menu item
 	assert (m_nCurrentMenuDepth >= 2);
 	assert (m_MenuStackMenu[0] = s_MainMenu);
-	unsigned nTG = m_nMenuStackSelection[0];
+	unsigned nTG = m_nMenuStackSelection[0] - nMenuItemsBeforeTG1;
 	assert (nTG < CConfig::AllToneGenerators);
-	assert (m_nMenuStackItem[1] == nTG);
+	assert (m_nMenuStackItem[1] == nTG + nMenuItemsBeforeTG1);
 	assert (m_nMenuStackParameter[1] == nTG);
 
 	assert (   Event == MenuEventPressAndStepDown
@@ -1259,10 +1260,9 @@ void CUIMenu::TGShortcutHandler (TMenuEvent Event)
 
 	if (nTG < m_nToneGenerators)
 	{
-		m_nMenuStackSelection[0] = nTG;
-		m_nMenuStackItem[1] = nTG;
+		m_nMenuStackSelection[0] = nTG + nMenuItemsBeforeTG1;
+		m_nMenuStackItem[1] = nTG + nMenuItemsBeforeTG1;
 		m_nMenuStackParameter[1] = nTG;
-
 		EventHandler (MenuEventUpdate);
 	}
 }