diff --git a/shell/android/res/layout/configure_fragment.xml b/shell/android/res/layout/configure_fragment.xml index 605aa4c0c..bedb845ad 100644 --- a/shell/android/res/layout/configure_fragment.xml +++ b/shell/android/res/layout/configure_fragment.xml @@ -384,6 +384,35 @@ + + + + + + + + + + diff --git a/shell/android/res/values/donottranslate.xml b/shell/android/res/values/donottranslate.xml index 88e608848..1af369859 100644 --- a/shell/android/res/values/donottranslate.xml +++ b/shell/android/res/values/donottranslate.xml @@ -24,8 +24,15 @@ chd gdi - - + + + NTSC-J + NTSC-U/PAL-M/PAL-N + PAL-E + reicast + + + NTSC-J NTSC-U/PAL-M/PAL-N PAL-E diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml index 5ecbf3ac8..8082d05be 100644 --- a/shell/android/res/values/strings.xml +++ b/shell/android/res/values/strings.xml @@ -20,6 +20,7 @@ Dynarec Options Unstable Optimisations DC Region + Broadcast Limit FPS Use Mipmaps (fix for old SGX540) Widescreen Mode diff --git a/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java index 87793d196..5af7ffdfe 100644 --- a/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java +++ b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java @@ -135,6 +135,43 @@ public class ConfigureFragment extends Fragment { }); + String[] broadcasts = parentActivity.getResources().getStringArray( + R.array.broadcast); + Spinner broadcast_spnr = (Spinner) getView().findViewById( + R.id.broadcast_spinner); + ArrayAdapter broadcastAdapter = new ArrayAdapter( + parentActivity, R.layout.spinner_selected, broadcasts); + broadcastAdapter + .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + broadcast_spnr.setAdapter(broadcastAdapter); + + int select = 0; + String cast = String.valueOf(Config.broadcast); + for (int i = 0; i < broadcasts.length; i++) { + if (broadcasts[i].startsWith(cast + " - ")) + select = i; + } + broadcast_spnr.setSelection(select, true); + + broadcast_spnr.setOnItemSelectedListener(new OnItemSelectedListener() { + + public void onItemSelected(AdapterView parent, View view, + int pos, long id) { + String item = parent.getItemAtPosition(pos).toString(); + String selection = item.substring(0, item.indexOf(" - ")); + mPrefs.edit() + .putInt("dc_broadcast", Integer.valueOf(selection)) + .commit(); + Config.broadcast = Integer.valueOf(selection); + + } + + public void onNothingSelected(AdapterView arg0) { + + } + + }); + OnCheckedChangeListener limitfps_option = new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView,