- removed 'init network' from startup settings.

- moved 'mount sd only' to startup settings.
- added reboot when 'sd only' is changed.
- added GC banner sound options by einsteinx2 to page 11 of main config.
- changed and added a few gecko prints

source/channel/nand.cpp

@@ -1253,14 +1253,16 @@ void Nand::SetPaths(const char *emuPath, const char *currentPart)
 
 	/* set wiiflow full nand path */
 	snprintf(FullNANDPath, sizeof(FullNANDPath), "%s:%s", currentPart, emuPath);
-	gprintf("Emu NAND Full Path = %s\n", FullNANDPath);	
+	// example - sd:/nands/default
 	
 	/* set IOS compatible NAND Path */
 	strncpy(NandPath, emuPath, sizeof(NandPath));
+	// example - /nands/default
+	
 	NandPath[sizeof(NandPath) - 1] = '\0';
+	
 	if(strlen(NandPath) == 0)
 		strcat(NandPath, "/");
-	gprintf("IOS Compatible NAND Path = %s\n", NandPath);
 }
 
 /*

source/gui/coverflow.cpp

@@ -647,7 +647,7 @@ void CCoverFlow::stopCoverLoader(bool empty)
 				m_items[i].state = STATE_Loading;
 			}
 		}
-		gprintf("Coverflow stopped!\n");
+		//gprintf("Coverflow stopped!\n");
 	}
 }
 
@@ -660,7 +660,7 @@ void CCoverFlow::startCoverLoader(void)
 	m_moved = true;
 
 	LWP_CreateThread(&coverLoaderThread, _coverLoader, this, coverThreadStack, coverThreadStackSize, 30);
-	gprintf("Coverflow started!\n");
+	//gprintf("Coverflow started!\n");
 }
 
 void CCoverFlow::clear(void)

source/main.cpp

@@ -168,6 +168,8 @@ int main(int argc, char **argv)
 		/* Handle (c)IOS Loading */
 		if(useMainIOS && CustomIOS(IOS_GetType(mainIOS))) /* Requested */
 			iosOK = loadIOS(mainIOS, false) && CustomIOS(CurrentIOS.Type);
+		else
+			gprintf("Using IOS58\n");
 	}
 		
 	/* sys inits */

source/menu/menu.cpp

@@ -158,7 +158,7 @@ bool CMenu::init()
 	m_use_sd_logging = m_cfg.getBool("DEBUG", "sd_write_log", false);
 	LogToSD_SetBuffer(m_use_sd_logging);
 	/* Init Network if wanted */
-	m_init_network = (m_cfg.getBool("GENERAL", "async_network") || has_enabled_providers() || m_use_wifi_gecko);
+	m_init_network = (has_enabled_providers() || m_use_wifi_gecko);
 	_netInit();
 	
 	/* Set SD only to off if any usb device is attached and format is FAT, NTFS, WBFS, or LINUX */
@@ -561,15 +561,6 @@ void CMenu::_Theme_Cleanup(void)
 	m_coverflow.unload();
 }
 
-void CMenu::_netInit(void)
-{
-	if(networkInit || !m_init_network || m_exit)
-		return;
-	_initAsyncNetwork();
-	while(net_get_status() == -EBUSY)
-		usleep(100);
-}
-
 void CMenu::_setAA(int aa)
 {
 	switch (aa)
@@ -2262,6 +2253,7 @@ bool CMenu::_loadWiiList(void)
 	if(!DeviceHandle.IsInserted(currentPartition))
 		return false;
 
+	gprintf("Adding wii list\n");
 	DeviceHandle.OpenWBFS(currentPartition);
 	string gameDir(fmt(wii_games_dir, DeviceName[currentPartition]));
 	string cacheDir(fmt("%s/%s_wii.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
@@ -2282,6 +2274,7 @@ bool CMenu::_loadHomebrewList()
 	if(!DeviceHandle.IsInserted(currentPartition))
 		return false;
 
+	gprintf("Adding homebrew list\n");
 	string gameDir(fmt(HOMEBREW_DIR, DeviceName[currentPartition]));
 	m_cacheList.CreateList(COVERFLOW_HOMEBREW, currentPartition, gameDir, stringToVector(".dol|.elf", '|'), std::string(), false);
 	for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++)
@@ -2295,6 +2288,7 @@ bool CMenu::_loadGamecubeList()
 	if(!DeviceHandle.IsInserted(currentPartition))
 		return false;
 
+	gprintf("Adding gamecube list\n");
 	string gameDir(fmt(gc_games_dir, DeviceName[currentPartition]));
 	string cacheDir(fmt("%s/%s_gamecube.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
 	bool updateCache = m_cfg.getBool(GC_DOMAIN, "update_cache");
@@ -2318,6 +2312,7 @@ bool CMenu::_loadChannelList(void)
 	vector<string> NullVector;
 	if(chantypes & CHANNELS_REAL)
 	{
+		gprintf("Adding real nand list\n");
 		NANDemuView = false;
 		m_cacheList.CreateList(COVERFLOW_CHANNEL, 9, std::string(), NullVector, std::string(), false);
 		for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++)
@@ -2329,6 +2324,7 @@ bool CMenu::_loadChannelList(void)
 		int emuPartition = _FindEmuPart(EMU_NAND, false);// check if emunand folder exist and on FAT
 		if(emuPartition >= 0)
 		{
+			gprintf("Adding emu nand list\n");
 			currentPartition = emuPartition;
 			string cacheDir = fmt("%s/%s_channels.db", m_listCacheDir.c_str(), DeviceName[currentPartition]);
 			bool updateCache = m_cfg.getBool(CHANNEL_DOMAIN, "update_cache");
@@ -2351,6 +2347,7 @@ bool CMenu::_loadPluginList()
 	bool addChannel = false;
 	bool updateCache = m_cfg.getBool(PLUGIN_DOMAIN, "update_cache");
 
+	gprintf("Adding plugins list\n");
 	for(u8 i = 0; m_plugin.PluginExist(i); ++i)
 	{
 		u32 Magic = m_plugin.getPluginMagic(i);

source/menu/menu_boot.cpp

@@ -17,8 +17,8 @@ s16 m_bootLblCIOSrevP;
 s16 m_bootLblUSBPort;
 s16 m_bootBtnUSBPort;
 
-s16 m_bootLblAsyncNet;
+s16 m_bootLblSDOnly;
-s16 m_bootBtnAsyncNet;
+s16 m_bootBtnSDOnly;
 
 u8 set_port = 0;
 
@@ -41,8 +41,8 @@ void CMenu::_hideBoot(bool instant)
 	m_btnMgr.hide(m_bootLblUSBPort, instant);
 	m_btnMgr.hide(m_bootBtnUSBPort, instant);
 	
-	m_btnMgr.hide(m_bootLblAsyncNet, instant);
+	m_btnMgr.hide(m_bootLblSDOnly, instant);
-	m_btnMgr.hide(m_bootBtnAsyncNet, instant);
+	m_btnMgr.hide(m_bootBtnSDOnly, instant);
 }
 
 void CMenu::_showBoot()
@@ -71,9 +71,9 @@ void CMenu::_showBoot()
 	m_btnMgr.show(m_bootLblUSBPort);
 	m_btnMgr.show(m_bootBtnUSBPort);
 
-	m_btnMgr.setText(m_bootBtnAsyncNet, m_cfg.getBool("GENERAL", "async_network", false) ? _t("on", L"On") : _t("off", L"Off"));
+	m_btnMgr.setText(m_bootBtnSDOnly, m_cfg.getBool("GENERAL", "sd_only") ? _t("yes", L"Yes") : _t("no", L"No"));
-	m_btnMgr.show(m_bootLblAsyncNet);
+	m_btnMgr.show(m_bootLblSDOnly);
-	m_btnMgr.show(m_bootBtnAsyncNet);
+	m_btnMgr.show(m_bootBtnSDOnly);
 }
 
 bool CMenu::_Boot(void)
@@ -86,6 +86,7 @@ bool CMenu::_Boot(void)
 	set_port = currentPort;
 	bool prev_load = cur_load;
 	u8 prev_ios = cur_ios;
+	bool prev_sd = m_cfg.getBool("GENERAL", "sd_only");
 	SetupInput();
 	_showBoot();
 
@@ -134,10 +135,10 @@ bool CMenu::_Boot(void)
 				set_port = !set_port;
 				m_btnMgr.setText(m_bootBtnUSBPort, wfmt(L"%i", set_port));
 			}
-			else if (m_btnMgr.selected(m_bootBtnAsyncNet))
+			else if (m_btnMgr.selected(m_bootBtnSDOnly))
 			{
-				m_cfg.setBool("GENERAL", "async_network", !m_cfg.getBool("GENERAL", "async_network", false));
+				m_cfg.setBool("GENERAL", "sd_only", !m_cfg.getBool("GENERAL", "sd_only"));
-				m_btnMgr.setText(m_bootBtnAsyncNet, m_cfg.getBool("GENERAL", "async_network", false) ? _t("on", L"On") : _t("off", L"Off"));
+				m_btnMgr.setText(m_bootBtnSDOnly, m_cfg.getBool("GENERAL", "sd_only") ?  _t("yes", L"Yes") : _t("no", L"No"));
 			}
 		}
 	}
@@ -147,8 +148,10 @@ bool CMenu::_Boot(void)
 		InternalSave.SavePort(set_port);
 	_hideBoot();
 
-	if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort)
+	bool cur_sd = m_cfg.getBool("GENERAL", "sd_only");
+	if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort || prev_sd != cur_sd)
 	{
+		error(_t("errboot8", L"Rebooting ..."));
 		m_exit = true;
 		m_reload = true;
 		return 1;
@@ -173,8 +176,8 @@ void CMenu::_initBoot(void)
 	m_bootLblUSBPort = _addLabel("BOOT/USB_PORT", theme.lblFont, L"", 20, 245, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_bootBtnUSBPort = _addButton("BOOT/USB_PORT_BTN", theme.btnFont, L"", 420, 250, 200, 48, theme.btnFontColor);
 	
-	m_bootLblAsyncNet = _addLabel("BOOT/ASYNCNET", theme.lblFont, L"", 20, 305, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
+	m_bootLblSDOnly = _addLabel("BOOT/SD_ONLY", theme.lblFont, L"", 20, 305, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
-	m_bootBtnAsyncNet = _addButton("BOOT/ASYNCNET_BTN", theme.btnFont, L"", 420, 310, 200, 48, theme.btnFontColor);
+	m_bootBtnSDOnly = _addButton("BOOT/SD_ONLY_BTN", theme.btnFont, L"", 420, 310, 200, 48, theme.btnFontColor);
 
 	_setHideAnim(m_bootLblTitle, "BOOT/TITLE", 0, 0, -2.f, 0.f);
 	_setHideAnim(m_bootBtnBack, "BOOT/BACK_BTN", 0, 0, 1.f, -1.f);
@@ -190,8 +193,8 @@ void CMenu::_initBoot(void)
 	_setHideAnim(m_bootLblUSBPort, "BOOT/USB_PORT", 50, 0, -2.f, 0.f);
 	_setHideAnim(m_bootBtnUSBPort, "BOOT/USB_PORT_BTN", -50, 0, 1.f, 0.f);
 
-	_setHideAnim(m_bootLblAsyncNet, "BOOT/ASYNCNET", 50, 0, -2.f, 0.f);
+	_setHideAnim(m_bootLblSDOnly, "BOOT/SD_ONLY", 50, 0, -2.f, 0.f);
-	_setHideAnim(m_bootBtnAsyncNet, "BOOT/ASYNCNET_BTN", -50, 0, 1.f, 0.f);
+	_setHideAnim(m_bootBtnSDOnly, "BOOT/SD_ONLY_BTN", -50, 0, 1.f, 0.f);
 	
 	_hideBoot(true);
 	_textBoot();
@@ -203,6 +206,6 @@ void CMenu::_textBoot(void)
 	m_btnMgr.setText(m_bootLblLoadCIOS, _t("cfgbt2", L"Force Load cIOS"));
 	m_btnMgr.setText(m_bootLblCIOSrev, _t("cfgbt3", L"Force cIOS Revision"));
 	m_btnMgr.setText(m_bootLblUSBPort, _t("cfgbt4", L"USB Port"));
-	m_btnMgr.setText(m_bootLblAsyncNet, _t("cfgp3", L"Init network on boot"));
+	m_btnMgr.setText(m_bootLblSDOnly, _t("cfg719", L"Mount SD only"));
 	m_btnMgr.setText(m_bootBtnBack, _t("cfg10", L"Back"));
 }

source/menu/menu_config7.cpp

@@ -134,8 +134,10 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.setText(m_config7Btn1, m_cfg.getBool("GENERAL", "random_select") ? _t("select", L"Select") : _t("boot", L"Boot"));
 		m_btnMgr.setText(m_config7Lbl2, _t("cfg718", L"Source Menu on start"));
 		m_btnMgr.setText(m_config7Btn2, m_cfg.getBool("GENERAL", "source_on_start") ? _t("yes", L"Yes") : _t("no", L"No"));
-		m_btnMgr.setText(m_config7Lbl3, _t("cfg719", L"SD only"));
+		m_btnMgr.setText(m_config7Lbl3, _t("cfg720", L"Play GC banner sound"));
-		m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("GENERAL", "sd_only") ? _t("yes", L"Yes") : _t("no", L"No"));
+		m_btnMgr.setText(m_config7Btn3, m_cfg.getBool(GC_DOMAIN, "play_banner_sound") ?  _t("yes", L"Yes") : _t("no", L"No"));
+		m_btnMgr.setText(m_config7Lbl4, _t("cfg721", L"Play GC default sound"));
+		m_btnMgr.setText(m_config7Btn4, m_cfg.getBool(GC_DOMAIN, "play_default_sound") ?  _t("yes", L"Yes") : _t("no", L"No"));
 	}
 }
 
@@ -273,8 +275,13 @@ int CMenu::_config7(int curPage)
 				}
 				else if(m_btnMgr.selected(m_config7Btn3))
 				{
-					m_cfg.setBool("GENERAL", "sd_only", !m_cfg.getBool("GENERAL", "sd_only"));
+					m_cfg.setBool(GC_DOMAIN, "play_banner_sound", !m_cfg.getBool(GC_DOMAIN, "play_banner_sound"));
-					m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("GENERAL", "sd_only") ?  _t("yes", L"Yes") : _t("no", L"No"));
+					m_btnMgr.setText(m_config7Btn3, m_cfg.getBool(GC_DOMAIN, "play_banner_sound") ?  _t("yes", L"Yes") : _t("no", L"No"));
+				}
+				else if(m_btnMgr.selected(m_config7Btn4))
+				{
+					m_cfg.setBool(GC_DOMAIN, "play_default_sound", !m_cfg.getBool(GC_DOMAIN, "play_default_sound"));
+					m_btnMgr.setText(m_config7Btn4, m_cfg.getBool(GC_DOMAIN, "play_default_sound") ?  _t("yes", L"Yes") : _t("no", L"No"));
 				}
 			}
 		}

source/menu/menu_config_game.cpp

@@ -894,9 +894,6 @@ void CMenu::_initGameSettingsMenu()
 	m_gameSettingsBtnLaunchNK = _addButton("GAME_SETTINGS/LAUNCHNEEK_BTN", theme.btnFont, L"", 420, 250, 200, 48, theme.btnFontColor);
 
 //GC Nintendont Page 4
-	//m_gameSettingsLblUSB_HID = _addLabel("GAME_SETTINGS/USB_HID", theme.lblFont, L"", 20, 125, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
-	//m_gameSettingsBtnUSB_HID = _addButton("GAME_SETTINGS/USB_HID_BTN", theme.btnFont, L"", 420, 130, 200, 48, theme.btnFontColor);
-
 	m_gameSettingsLblCC_Rumble = _addLabel("GAME_SETTINGS/CC_RUMBLE", theme.lblFont, L"", 20, 125, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsBtnCC_Rumble = _addButton("GAME_SETTINGS/CC_RUMBLE_BTN", theme.btnFont, L"", 420, 130, 200, 48, theme.btnFontColor);
 

source/menu/menu_download.cpp

@@ -730,6 +730,15 @@ void CMenu::_textDownload(void)
 
 /************************************* Setup network connection *********************************************/
 
+void CMenu::_netInit(void)
+{
+	if(networkInit || !m_init_network || m_exit)
+		return;
+	_initAsyncNetwork();
+	while(net_get_status() == -EBUSY)
+		usleep(100);
+}
+
 void CMenu::_initAsyncNetwork()
 {
 	if(!_isNetworkAvailable())

source/menu/menu_error.cpp

@@ -29,7 +29,7 @@ void CMenu::error(const wstringEx &msg)
 	m_btnMgr.setText(m_errorLblMessage, msg, true);
 	_showError();
 
-	gprintf(msg.toUTF8().c_str());
+	gprintf("error msg: %s\n", msg.toUTF8().c_str());
 	do
 	{
 		_mainLoopCommon();

source/menu/menu_game.cpp

@@ -780,6 +780,10 @@ void CMenu::_game(bool launch)
 
 					/* Finally boot it */
 					gprintf("Launching game %s\n", hdr->id);
+					if(hdr->type == TYPE_EMUCHANNEL)
+						gprintf("from emu nand\n");
+					else if(hdr->type == TYPE_CHANNEL)
+						gprintf("from real nand\n");
 					_launch(hdr);
 
 					if(m_exit)

source/menu/menu_main.cpp

@@ -236,6 +236,8 @@ void CMenu::_showCF(bool refreshList)
 	/* set the covers and titles to the positions and angles based on the cf layout */
 	CoverFlow.applySettings();
 
+	gprintf("Displaying covers\n");
+
 	/* display game count if not sourceflow or homebrew */
 	if(m_sourceflow || m_current_view == COVERFLOW_HOMEBREW)
 		return;
@@ -287,6 +289,8 @@ int CMenu::main(void)
 	m_vid.set2DViewport(m_cfg.getInt("GENERAL", "tv_width", 640), m_cfg.getInt("GENERAL", "tv_height", 480),
 						m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0));
 
+	gprintf("Bootup completed!\n");
+
 	m_refreshGameList = true;
 	_showMain();
 	if(show_mem)
@@ -294,10 +298,8 @@ int CMenu::main(void)
 		m_btnMgr.show(m_mem1FreeSize);
 		m_btnMgr.show(m_mem2FreeSize);
 	}
-	
 	SetupInput(true);
 
-	gprintf("wiiflow main screen ready!\n");
 	while(!m_exit)
 	{
 		/* IMPORTANT check if a disc is inserted */

source/menu/menu_nandemu.cpp

@@ -160,6 +160,7 @@ void CMenu::_checkEmuNandSettings(void)
 			}
 		}
 	}
+	gprintf("emu nand path = %s:/%s/%s\n", DeviceName[emuPart],  emu_nands_dir, emuNands[curEmuNand]);
  
 	_listEmuNands(fmt("%s:/%s", DeviceName[savesPart],  emu_nands_dir), savesNands);
 	curSavesNand = 0;
@@ -182,6 +183,7 @@ void CMenu::_checkEmuNandSettings(void)
 			}
 		}
 	}
+	gprintf("saves nand path = %s:/%s/%s\n", DeviceName[savesPart],  emu_nands_dir, savesNands[curSavesNand]);
 	
 	m_cfg.setString(WII_DOMAIN, "current_save_emunand", savesNands[curSavesNand]);
 	m_cfg.setInt(WII_DOMAIN, "savepartition", savesPart);

wii/wiiflow/Languages/english.ini

@@ -60,7 +60,9 @@ cfg715=Randomize music
 cfg716=Music fade rate
 cfg717=Random game boot or select
 cfg718=Source Menu on start
-cfg719=SD only
+cfg719=Mount SD only
+cfg720=Play GC banner sound
+cfg721=Play GC default sound
 cfga2=Install game
 cfga3=Install
 cfga6=Language
@@ -307,6 +309,7 @@ errboot4=No apps/wiiflow directory found!
 errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
 errboot6=No available usb partitions for data and no SD inserted!\nExiting.
 errboot7=Access denied in Wii VC mode.
+errboot8=Rebooting ...
 errgame1=Cannot find the game with ID: %s
 errgame2=No cIOS found!
 errgame4=Couldn't load IOS %i