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

MainAndroid: Remove s_filename

Browse Source 
This fits better as a function parameter than as global state.
This commit is contained in:
JosJuice
2017-08-23 22:32:23 +02:00
parent 4ee85a3e07
commit f8703f90e3
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -246,13 +246,6 @@ public final class NativeLibrary
*/
public static native void SetConfig(String configFile, String Section, String Key, String Value);
/**
* Sets the filename to be run during emulation.
*
* @param filename The filename to be run during emulation.
*/
public static native void SetFilename(String filename);
/**
* Gets the embedded banner within the given ISO/ROM.
*
@ -328,7 +321,7 @@ public final class NativeLibrary
/**
* Begins emulation.
*/
public static native void Run();
public static native void Run(String path);
// Surface Handling
public static native void SurfaceChanged(Surface surf);

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -66,9 +66,6 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
String path = getArguments().getString(ARGUMENT_GAME_PATH);
NativeLibrary.SetFilename(path);
View contents = inflater.inflate(R.layout.fragment_emulation, container, false);
SurfaceView surfaceView = (SurfaceView) contents.findViewById(R.id.surface_emulation);
@ -241,7 +238,8 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
Log.info("[EmulationFragment] Starting emulation: " + mSurface);
// Start emulation using the provided Surface.
NativeLibrary.Run();
String path = getArguments().getString(ARGUMENT_GAME_PATH);
NativeLibrary.Run(path);
}
};