libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-25 11:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some cleanup, make really sure we don't use AudioTrack on Gingerbread+.

Browse Source
This commit is contained in:
Henrik Rydgård 2014-02-07 14:18:45 +01:00
parent 4a743ca627
commit 48b4745e73
5 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app-android.cpp
View File

@ -125,6 +125,8 @@ std::string GetJavaString(JNIEnv *env, jstring jstr) {
return cpp_string;
}
// This is now only used as a trigger for GetAppInfo as a function to all before Init.
// On Android we don't use any of the values it returns.
extern "C" jboolean Java_com_henrikrydgard_libnative_NativeApp_isLandscape(JNIEnv *env, jclass) {
std::string app_name, app_nice_name;
bool landscape;

53
android/src/com/henrikrydgard/libnative/NativeActivity.java
View File

@ -101,8 +101,6 @@ public class NativeActivity extends Activity {
private NativeAudioPlayer audioPlayer;
protected NativeRenderer nativeRenderer;
boolean useOpenSL = false;
private String shortcutParam = "";
public static String runCommand;
@ -181,22 +179,26 @@ public class NativeActivity extends Activity {
this.shortcutParam = ((shortcutParam == null) ? "" : shortcutParam);
}
private boolean useOpenSL() {
// Native OpenSL became available on Gingerbread. Let's use it!
return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD);
}
public void Initialize() {
// Initialize audio classes. Do this here since detectOptimalAudioSettings()
// Initialize audio classes. Do this here since detectOptimalAudioSettings()
// needs audioManager
this.audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
this.audioFocusChangeListener = new AudioFocusChangeListener();
if (Build.VERSION.SDK_INT >= 9) {
// Native OpenSL is available. Let's use it!
useOpenSL = true;
}
if (Build.VERSION.SDK_INT >= 17) {
// Get the optimal buffer sz
detectOptimalAudioSettings();
}
Log.i(TAG, "onCreate");
// isLandscape is used to trigger GetAppInfo currently, we
boolean landscape = NativeApp.isLandscape();
Log.d(TAG, "Landscape: " + landscape);
// Get system information
ApplicationInfo appInfo = null;
PackageManager packMgmr = getPackageManager();
@ -212,45 +214,29 @@ public class NativeActivity extends Activity {
File sdcard = Environment.getExternalStorageDirectory();
Display display = ((WindowManager)this.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
@SuppressWarnings("deprecation")
int scrPixelFormat = display.getPixelFormat();
Point size = new Point();
GetScreenSize(size);
int scrWidth = size.x;
int scrHeight = size.y;
float scrRefreshRate = display.getRefreshRate();
float scrRefreshRate = display.getRefreshRate();
String externalStorageDir = sdcard.getAbsolutePath();
String dataDir = this.getFilesDir().getAbsolutePath();
String apkFilePath = appInfo.sourceDir;
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
int dpi = metrics.densityDpi;
// We only use dpi to calculate the width. Smaller aspect ratios have giant text despite high DPI.
// Uh, I mean, this makes no sense. What was I thinking when I wrote this? Let's just use the DPI as it is.
// dpi = (int)((float)dpi * ((float)scrWidth/(float)scrHeight) / (16.0/9.0)); // Adjust to 16:9
int dpi = metrics.densityDpi;
String deviceType = Build.MANUFACTURER + ":" + Build.MODEL;
String languageRegion = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry();
NativeApp.audioConfig(optimalFramesPerBuffer, optimalSampleRate);
NativeApp.init(dpi, deviceType, languageRegion, apkFilePath, dataDir, externalStorageDir, libraryDir, shortcutParam, installID, useOpenSL);
NativeApp.init(dpi, deviceType, languageRegion, apkFilePath, dataDir, externalStorageDir, libraryDir, shortcutParam, installID, useOpenSL());
// OK, config should be initialized, we can query for screen rotation.
if (Build.VERSION.SDK_INT >= 9) {
updateScreenRotation();
}
/*
if (NativeApp.isLandscape()) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}*/
Log.i(TAG, "Device: " + deviceType);
Log.i(TAG, "W : " + scrWidth + " H: " + scrHeight + " rate: " + scrRefreshRate + " fmt: " + scrPixelFormat + " dpi: " + dpi);
Log.i(TAG, " rate: " + scrRefreshRate + " dpi: " + dpi);
// Detect OpenGL support.
// We don't currently use this detection for anything but good to have in the log.
@ -269,13 +255,6 @@ public class NativeActivity extends Activity {
if (Build.VERSION.SDK_INT >= 11) {
checkForVibrator();
}
/*
editText = new EditText(this);
editText.setText("Hello world");
addContentView(editText, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
*/
// inputBox("Please ener a s", "", "Save");
}
@TargetApi(9)
@ -334,9 +313,11 @@ public class NativeActivity extends Activity {
setVolumeControlStream(AudioManager.STREAM_MUSIC);
// Initialize audio and tell PPSSPP to gain audio focus
if (!useOpenSL) {
if (!useOpenSL()) {
Log.w(TAG, "Falling back to AudioTrack");
audioPlayer = new NativeAudioPlayer();
}
NativeAudioPlayer.gainAudioFocus(this.audioManager, this.audioFocusChangeListener);
NativeApp.audioInit();

3
android/src/com/henrikrydgard/libnative/NativeAudioPlayer.java
View File

@ -16,7 +16,6 @@ public class NativeAudioPlayer {
public synchronized void stop() {
if (thread != null) {
waitUntilDone();
} else {
Log.e(TAG, "Was already stopped");
}
@ -48,8 +47,8 @@ public class NativeAudioPlayer {
}
}
private void playStreaming() {
playing_ = true;
thread = new Thread(new Runnable() {
public void run() {

2
android/src/com/henrikrydgard/libnative/NativeRenderer.java
View File

@ -31,7 +31,7 @@ public class NativeRenderer implements GLSurfaceView.Renderer {
}
public void onSurfaceCreated(GL10 unused, EGLConfig config) {
Log.i(TAG, "onSurfaceCreated - EGL context is new or was lost");
// Log.i(TAG, "onSurfaceCreated - EGL context is new or was lost");
// Actually, it seems that it is here we should recreate lost GL objects.
displayInit();
}

8
base/PCMain.cpp
View File

@ -111,7 +111,7 @@ int8_t EGL_Open() {
}
int8_t EGL_Init() {
EGLConfig g_eglConfig; //[1] = {NULL};
EGLConfig g_eglConfig;
EGLint g_numConfigs = 0;
EGLint attrib_list[]= {
#ifdef PANDORA
@ -140,8 +140,7 @@ int8_t EGL_Init() {
// Get the SDL window handle
SDL_SysWMinfo sysInfo; //Will hold our Window information
SDL_VERSION(&sysInfo.version); //Set SDL version
if(SDL_GetWMInfo(&sysInfo) <= 0)
{
if(SDL_GetWMInfo(&sysInfo) <= 0) {
printf("EGL ERROR: Unable to get SDL window handle: %s\n", SDL_GetError());
return 1;
}
@ -162,8 +161,7 @@ int8_t EGL_Init() {
}
void EGL_Close() {
if (g_eglDisplay != NULL)
{
if (g_eglDisplay != NULL) {
eglMakeCurrent(g_eglDisplay, NULL, NULL, EGL_NO_CONTEXT);
if (g_eglContext != NULL) {
eglDestroyContext(g_eglDisplay, g_eglContext);