Updated android GCM references to ISO

This commit is contained in:
Stevoisiak 2014-11-02 12:22:36 -05:00
parent 7f66344b64
commit d937c072a5
4 changed files with 13 additions and 13 deletions

View File

@ -1,8 +1,8 @@
[General]
GCMPathes = 0
ISOPaths = 0
LastFilename =
ShowLag = False
RecursiveGCMPaths = False
RecursiveISOPaths = False
NANDRoot = //sdcard/dolphin-emu/Wii
WirelessMac =
[Core]
@ -14,7 +14,7 @@ Fastmem = False
DSPThread = False
DSPHLE = True
SkipIdle = True
DefaultGCM =
DefaultISO =
DVDRoot =
Apploader =
EnableCheats = False

View File

@ -133,7 +133,7 @@ public final class FolderBrowser extends ListFragment
private void FolderSelected()
{
String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
int intDirectories = Integer.parseInt(Directories);
// Check to see if a path set in the Dolphin config
@ -142,9 +142,9 @@ public final class FolderBrowser extends ListFragment
boolean pathNotPresent = true;
for (int i = 0; i < intDirectories; i++)
{
String gcmPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
String isoPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
if (gcmPath.equals(currentDir.getPath()))
if (isoPath.equals(currentDir.getPath()))
{
pathNotPresent = false;
}
@ -157,8 +157,8 @@ public final class FolderBrowser extends ListFragment
// User doesn't have this path in the config, so add it.
if (pathNotPresent)
{
NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Integer.toString(intDirectories+1));
NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), currentDir.getPath());
NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPaths", Integer.toString(intDirectories+1));
NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPath" + Integer.toString(intDirectories), currentDir.getPath());
}
((GameListActivity)getActivity()).SwitchPage(0);

View File

@ -263,16 +263,16 @@ public final class GameListActivity extends Activity
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which)
{
String directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
String directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
int intDirs = Integer.parseInt(directories);
for (int i = 0; i < intDirs; i++)
{
NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
}
// Since we flushed all paths, we signify this in the ini.
NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", "0");
NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPaths", "0");
// Now finally, clear the game list.
((GameListFragment) getFragmentManager().findFragmentById(R.id.content_frame)).clearGameList();

View File

@ -63,7 +63,7 @@ public final class GameListFragment extends ListFragment
private void fill()
{
List<GameListItem> fls = new ArrayList<GameListItem>();
String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
int intDirectories = Integer.parseInt(Directories);
// Extensions to filter by.
@ -71,7 +71,7 @@ public final class GameListFragment extends ListFragment
for (int a = 0; a < intDirectories; ++a)
{
String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + a, "");
String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + a, "");
File currentDir = new File(BrowseDir);
File[] dirs = currentDir.listFiles();
try