diff options
| author | JosJuice <josjuice@gmail.com> | 2017-08-23 22:32:23 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-08-23 22:36:21 +0200 |
| commit | f8703f90e309303fea272a0078abc4e3fa4167ed (patch) | |
| tree | eda14ce765210f22e23dc6ca0fa1a02e8ce02476 /Source/Android/app/src/main/java | |
| parent | 4ee85a3e076f8f5569809542b8d8a8869b9b47f9 (diff) | |
MainAndroid: Remove s_filename
This fits better as a function parameter than as global state.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 9 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index bb9a75194b..de821f105c 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -247,13 +247,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. * * @param filename the file path to the 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); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java index 7066b34c65..5bf1a7d677 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java @@ -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); } }; |