ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 from LoungeKatt/master 

Update Moga lib, Refresh home between windows
This commit is contained in:
TwistedUmbrella 2014-10-01 13:20:09 -04:00
parent aa33d230e5 846edc61d3
commit 25c334e067
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
shell/android/libs/com.bda.controller.jar
View File

Binary file not shown.

2
shell/android/src/com/reicast/emulator/FileBrowser.java
View File

@ -149,7 +149,7 @@ public class FileBrowser extends Fragment {
* findViewById(R.id.about).setOnTouchListener(viblist); * findViewById(R.id.about).setOnTouchListener(viblist);
*/ */
File home = new File(home_directory); File home = new File(mPrefs.getString(Config.pref_home, home_directory));
if (!home.exists() || !home.isDirectory()) { if (!home.exists() || !home.isDirectory()) {
Toast.makeText(getActivity(), R.string.config_home, Toast.makeText(getActivity(), R.string.config_home,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();

17
shell/android/src/com/reicast/emulator/MainActivity.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -376,12 +377,16 @@ public class MainActivity extends SlidingFragmentActivity implements
builder.show(); builder.show();
} }
public static boolean isBiosExisting() { public static boolean isBiosExisting(Context context) {
SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
home_directory = mPrefs.getString("home_directory", home_directory);
File bios = new File(home_directory, "data/dc_boot.bin"); File bios = new File(home_directory, "data/dc_boot.bin");
return bios.exists(); return bios.exists();
} }
public static boolean isFlashExisting() { public static boolean isFlashExisting(Context context) {
SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
home_directory = mPrefs.getString("home_directory", home_directory);
File flash = new File(home_directory, "data/dc_flash.bin"); File flash = new File(home_directory, "data/dc_flash.bin");
return flash.exists(); return flash.exists();
} }
@ -392,9 +397,9 @@ public class MainActivity extends SlidingFragmentActivity implements
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
String msg = null; String msg = null;
if (!isBiosExisting()) if (!isBiosExisting(MainActivity.this))
msg = getString(R.string.missing_bios, home_directory); msg = getString(R.string.missing_bios, home_directory);
else if (!isFlashExisting()) else if (!isFlashExisting(MainActivity.this))
msg = getString(R.string.missing_flash, home_directory); msg = getString(R.string.missing_flash, home_directory);
if (msg != null) { if (msg != null) {
@ -402,9 +407,9 @@ public class MainActivity extends SlidingFragmentActivity implements
this); this);
// set title // set title
if (!isBiosExisting()) if (!isBiosExisting(MainActivity.this))
alertDialogBuilder.setTitle(R.string.missing_bios_title); alertDialogBuilder.setTitle(R.string.missing_bios_title);
else if (!isFlashExisting()) else if (!isFlashExisting(MainActivity.this))
alertDialogBuilder.setTitle(R.string.missing_flash_title); alertDialogBuilder.setTitle(R.string.missing_flash_title);
// set dialog message // set dialog message

2
shell/android/src/com/reicast/emulator/config/InputFragment.java
View File

@ -102,7 +102,7 @@ public class InputFragment extends Fragment {
} }
}); });
if (!MainActivity.isBiosExisting() || !MainActivity.isFlashExisting()) if (!MainActivity.isBiosExisting(parentActivity) || !MainActivity.isFlashExisting(parentActivity))
buttonLaunchEditor.setEnabled(false); buttonLaunchEditor.setEnabled(false);
final TextView duration = (TextView) getView().findViewById(R.id.vibDuration_current); final TextView duration = (TextView) getView().findViewById(R.id.vibDuration_current);

2
shell/android/src/com/reicast/emulator/config/OptionsFragment.java
View File

@ -33,6 +33,7 @@ import android.widget.TextView;
import com.reicast.emulator.R; import com.reicast.emulator.R;
import com.reicast.emulator.emu.GL2JNIView; import com.reicast.emulator.emu.GL2JNIView;
import com.reicast.emulator.emu.JNIdc;
import de.ankri.views.Switch; import de.ankri.views.Switch;
@ -119,6 +120,7 @@ public class OptionsFragment extends Fragment {
} }
mPrefs.edit().putString("home_directory", home_directory) mPrefs.edit().putString("home_directory", home_directory)
.commit(); .commit();
JNIdc.config(home_directory);
} }
} }