Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-27 06:29:19 +00:00
Code Issues Projects Releases Wiki Activity

Allow configuration of device audio latency/buffersize on Android

Browse Source
This commit is contained in:
Aaron Culliney 2015-07-25 13:02:20 -07:00
parent 36baaa04d5
commit 9ac6448593
4 changed files with 104 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AudioSettingsMenu.java
View File

@ -165,6 +165,65 @@ public class Apple2AudioSettingsMenu implements Apple2MenuView {
seekBarValue.setText("" + vol);
return convertView;
}
},
ADVANCED_SEPARATOR {
@Override public String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.settings_advanced);
}
@Override public String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.settings_advanced_summary);
}
},
AUDIO_LATENCY {
@Override public String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.audio_latency);
}
@Override public String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.audio_latency_summary);
}
@Override public View getView(final Apple2Activity activity, View convertView) {
LayoutInflater inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = inflater.inflate(R.layout.a2preference_slider, null, false);
TextView tv = (TextView)convertView.findViewById(R.id.a2preference_slider_summary);
tv.setText(getSummary(activity));
final TextView seekBarValue = (TextView)convertView.findViewById(R.id.a2preference_slider_seekBarValue);
final SeekBar sb = (SeekBar)convertView.findViewById(R.id.a2preference_slider_seekBar);
sb.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (!fromUser) {
return;
}
if (progress <= 0) {
// buffer size cannot be zero
progress = 1;
sb.setProgress(progress);
}
float latencySecs = (float)progress / Apple2Preferences.AUDIO_LATENCY_NUM_CHOICES;
seekBarValue.setText("" + latencySecs);
Apple2Preferences.AUDIO_LATENCY.saveFloat(activity, latencySecs);
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
});
sb.setMax(0); // http://stackoverflow.com/questions/10278467/seekbar-not-setting-actual-progress-setprogress-not-working-on-early-android
sb.setMax(Apple2Preferences.AUDIO_LATENCY_NUM_CHOICES);
float latencySecs = Apple2Preferences.AUDIO_LATENCY.floatValue(activity);
seekBarValue.setText("" + latencySecs);
int tick = (int) (latencySecs * (float) Apple2Preferences.AUDIO_LATENCY_NUM_CHOICES);
sb.setProgress(tick);
return convertView;
}
};
private static View _basicView(Apple2Activity activity, SETTINGS setting, View convertView) {

40
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
View File

@ -71,6 +71,27 @@ public enum Apple2Preferences {
@Override public int intValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), Volume.MEDIUM.ordinal());
}
},
AUDIO_LATENCY {
@Override public void load(Apple2Activity activity) {
nativeSetAudioLatency(floatValue(activity));
}
@Override public float floatValue(Apple2Activity activity) {
float defaultLatency = 0.f;
if (defaultLatency == 0.f) {
int sampleRateCanary = DevicePropertyCalculator.getRecommendedSampleRate(activity);
if (sampleRateCanary == DevicePropertyCalculator.defaultSampleRate) {
// quite possibly an audio-challenged device
defaultLatency = 0.4f;
} else {
// reasonable default for high-end devices
defaultLatency = 0.25f;
}
}
return activity.getPreferences(Context.MODE_PRIVATE).getFloat(toString(), defaultLatency);
}
};
public enum HiresColor {
@ -111,16 +132,21 @@ public enum Apple2Preferences {
dialog.show();
}
public final static int AUDIO_LATENCY_NUM_CHOICES = 20;
public final static String TAG = "Apple2Preferences";
// set and apply
public void saveBoolean(Apple2Activity activity, boolean value) {
activity.getPreferences(Context.MODE_PRIVATE).edit().putBoolean(toString(), value).apply();
load(activity);
}
public void saveInt(Apple2Activity activity, int value) {
activity.getPreferences(Context.MODE_PRIVATE).edit().putInt(toString(), value).apply();
load(activity);
}
public void saveBoolean(Apple2Activity activity, boolean value) {
activity.getPreferences(Context.MODE_PRIVATE).edit().putBoolean(toString(), value).apply();
public void saveFloat(Apple2Activity activity, float value) {
activity.getPreferences(Context.MODE_PRIVATE).edit().putFloat(toString(), value).apply();
load(activity);
}
public void saveHiresColor(Apple2Activity activity, HiresColor value) {
@ -142,12 +168,21 @@ public enum Apple2Preferences {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), 0);
}
public float floatValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getFloat(toString(), 0.0f);
}
public static void loadPreferences(Apple2Activity activity) {
for (Apple2Preferences pref : Apple2Preferences.values()) {
pref.load(activity);
}
}
public static void resetPreferences(Apple2Activity activity) {
activity.getPreferences(Context.MODE_PRIVATE).edit().clear().commit();
loadPreferences(activity);
}
private static native void nativeEnableTouchJoystick(boolean enabled);
private static native void nativeEnableTiltJoystick(boolean enabled);
private static native void nativeSetColor(int color);
@ -155,4 +190,5 @@ public enum Apple2Preferences {
private static native void nativeSetSpeakerVolume(int volume);
private static native boolean nativeSetMockingboardEnabled(boolean enabled);
private static native void nativeSetMockingboardVolume(int volume);
private static native void nativeSetAudioLatency(float latencySecs);
}

3
Android/app/src/main/java/org/deadc0de/apple2ix/DevicePropertyCalculator.java
View File

@ -38,6 +38,8 @@ import android.os.Build;
*/
public final class DevicePropertyCalculator
{
public final static int defaultSampleRate = 22050;
public static boolean detectLowLatency( Context aContext )
{
// check for low latency audio
@ -84,7 +86,6 @@ public final class DevicePropertyCalculator
SR_CHECK = am.getProperty( AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE );
}
final int defaultSampleRate = 22050;
return ( SR_CHECK != null ) ? Integer.parseInt( SR_CHECK ) : defaultSampleRate;
}

6
Android/app/src/main/res/values/strings.xml
View File

@ -9,7 +9,9 @@
<string name="action_settings">Settings</string>
<string name="app_name">Apple2ix</string>
<string name="audio_configure">Configure audio…</string>
<string name="audio_configure_summary">Volume, mockingboard, etc</string>
<string name="audio_configure_summary">Speaker volume, Mockingboard, etc</string>
<string name="audio_latency">Audio latency</string>
<string name="audio_latency_summary">Audio latency in secs</string>
<string name="cancel">Cancel</string>
<string name="color_bw">Black/white</string>
<string name="color_color">Color</string>
@ -63,6 +65,8 @@
<string name="speed_swipe_summary">Left/right swiping decreases/increases emulation speed</string>
<string name="settings">Apple2ix emulator settings</string>
<string name="settings_audio">Apple2ix audio settings</string>
<string name="settings_advanced">Advanced settings</string>
<string name="settings_advanced_summary">Warning: these settings may potentially degrade emulation performance</string>
<string name="tab_general">General</string>
<string name="tab_joystick">Joystick</string>
<string name="title_activity_second">SecondActivity</string>