removed ImageFolder from GCSettings because it can always be retrieved from GCSettings.PreviewImage, added function to get its value

This commit is contained in:
Zalo 2019-01-02 17:16:32 +01:00
parent dc4d93d006
commit 85cc152ca9
4 changed files with 16 additions and 11 deletions

View File

@ -948,7 +948,7 @@ static int MenuGameSelection()
GuiFileBrowser gameBrowser(330, 268);
gameBrowser.SetPosition(20, 98);
ResetBrowser();
GuiImage bgPreview(&bgPreviewImg);
bgPreview.SetPosition(365, 98);
@ -1042,7 +1042,7 @@ static int MenuGameSelection()
if(previousBrowserIndex != browser.selIndex)
{
previousBrowserIndex = browser.selIndex;
snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], GCSettings.ImageFolder, browserList[browser.selIndex].displayname);
snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], ImageFolder(), browserList[browser.selIndex].displayname);
AllocSaveBuffer();
int width, height;
@ -3999,16 +3999,13 @@ static int MenuSettingsMenu()
switch(GCSettings.PreviewImage)
{
case 0:
sprintf(options.value[6], "Screenshots");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ScreenshotsFolder);
sprintf(options.value[6], "Screenshots");
break;
case 1:
sprintf(options.value[6], "Covers");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.CoverFolder);
sprintf(options.value[6], "Covers");
break;
case 2:
sprintf(options.value[6], "Artwork");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ArtworkFolder);
break;
}

View File

@ -132,7 +132,6 @@ preparePrefsData ()
createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder);
createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder);
createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder);
createXMLSetting("ImageFolder", "Image Folder", GCSettings.ImageFolder);
createXMLSection("Network", "Network Settings");
@ -317,7 +316,6 @@ decodePrefsData ()
loadXMLSetting(GCSettings.ScreenshotsFolder, "ScreenshotsFolder", sizeof(GCSettings.ScreenshotsFolder));
loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder));
loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder));
loadXMLSetting(GCSettings.ImageFolder, "ImageFolder", sizeof(GCSettings.ImageFolder));
// Network Settings
@ -433,7 +431,6 @@ DefaultSettings ()
sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files
sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files
sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files
sprintf (GCSettings.ImageFolder, "%s/screenshots", APPFOLDER);
GCSettings.AutoLoad = 1;
GCSettings.AutoSave = 1;

View File

@ -558,3 +558,13 @@ int main(int argc, char *argv[])
} // emulation loop
} // main loop
}
char* ImageFolder()
{
switch(GCSettings.PreviewImage)
{
case 1 : return GCSettings.CoverFolder; break;
case 2 : return GCSettings.ArtworkFolder; break;
default: return GCSettings.ScreenshotsFolder; break;
}
}

View File

@ -92,7 +92,6 @@ struct SGCSettings{
char ScreenshotsFolder[MAXPATHLEN]; // Path to screenshots files
char CoverFolder[MAXPATHLEN]; // Path to cover files
char ArtworkFolder[MAXPATHLEN]; // Path to artwork files
char ImageFolder[MAXPATHLEN]; // Saved image folder path
int AutoloadGame;
char smbip[80];
@ -123,6 +122,8 @@ struct SGCSettings{
int Interpolation;
};
char* ImageFolder();
void ExitApp();
void ShutdownWii();
bool SupportedIOS(u32 ios);