piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated android GCM references to ISO

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/assets/Dolphin.ini
View File

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

10
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
View File

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

6
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
View File

@ -263,16 +263,16 @@ public final class GameListActivity extends Activity
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) 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); int intDirs = Integer.parseInt(directories);
for (int i = 0; i < intDirs; i++) 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. // 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. // Now finally, clear the game list.
((GameListFragment) getFragmentManager().findFragmentById(R.id.content_frame)).clearGameList(); ((GameListFragment) getFragmentManager().findFragmentById(R.id.content_frame)).clearGameList();

4
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
View File

@ -63,7 +63,7 @@ public final class GameListFragment extends ListFragment
private void fill() private void fill()
{ {
List<GameListItem> fls = new ArrayList<GameListItem>(); 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); int intDirectories = Integer.parseInt(Directories);
// Extensions to filter by. // Extensions to filter by.
@ -71,7 +71,7 @@ public final class GameListFragment extends ListFragment
for (int a = 0; a < intDirectories; ++a) 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 currentDir = new File(BrowseDir);
File[] dirs = currentDir.listFiles(); File[] dirs = currentDir.listFiles();
try try