From 5f9199830285639a03d82e211de776e9d3e73a66 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 24 Jun 2013 01:23:24 -0500 Subject: [PATCH] [Android] Add default Android config file --- Source/Android/assets/Dolphin.ini | 186 ++++++++++++++++++ .../dolphinemu/DolphinEmulator.java | 17 +- 2 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 Source/Android/assets/Dolphin.ini diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini new file mode 100644 index 0000000000..1ccac4d26e --- /dev/null +++ b/Source/Android/assets/Dolphin.ini @@ -0,0 +1,186 @@ +[General] +GCMPathes = 0 +LastFilename = +ShowLag = False +RecursiveGCMPaths = False +NANDRoot = //sdcard/dolphin-emu/Wii +WirelessMac = +[Core] +CPUCore = 3 +CPUThread = False +GFXBackend = Software Renderer +HLE_BS2 = False +Fastmem = True +DSPThread = False +DSPHLE = True +SkipIdle = True +DefaultGCM = +DVDRoot = +Apploader = +EnableCheats = False +SelectedLanguage = 0 +DPL2Decoder = False +Latency = 14 +MemcardA = +MemcardB = +SlotA = 1 +SlotB = 255 +SerialPort1 = 255 +BBA_MAC = +SIDevice0 = 6 +SIDevice1 = 0 +SIDevice2 = 0 +SIDevice3 = 0 +WiiSDCard = False +WiiKeyboard = False +WiimoteReconnectOnLoad = True +WiimoteContinuousScanning = False +WiimoteEnableSpeaker = True +RunCompareServer = False +RunCompareClient = False +FrameLimit = 0x00000001 +UseFPS = False +[Interface] +ConfirmStop = False +UsePanicHandlers = True +OnScreenDisplayMessages = True +HideCursor = False +AutoHideCursor = False +MainWindowPosX = 100 +MainWindowPosY = 100 +MainWindowWidth = 800 +MainWindowHeight = 600 +Language = 0 +ShowToolbar = True +ShowStatusbar = True +ShowLogWindow = False +ShowLogConfigWindow = False +ShowConsole = False +ThemeName = Boomy +[Hotkeys] +Open = 79 +OpenModifier = 2 +ChangeDisc = 0 +ChangeDiscModifier = 0 +RefreshList = 0 +RefreshListModifier = 0 +PlayPause = 349 +PlayPauseModifier = 0 +Stop = 27 +StopModifier = 0 +Reset = 0 +ResetModifier = 0 +FrameAdvance = 0 +FrameAdvanceModifier = 0 +StartRecording = 0 +StartRecordingModifier = 0 +PlayRecording = 0 +PlayRecordingModifier = 0 +ExportRecording = 0 +ExportRecordingModifier = 0 +Readonlymode = 0 +ReadonlymodeModifier = 0 +ToggleFullscreen = 13 +ToggleFullscreenModifier = 1 +Screenshot = 348 +ScreenshotModifier = 0 +Exit = 0 +ExitModifier = 0 +Wiimote1Connect = 344 +Wiimote1ConnectModifier = 1 +Wiimote2Connect = 345 +Wiimote2ConnectModifier = 1 +Wiimote3Connect = 346 +Wiimote3ConnectModifier = 1 +Wiimote4Connect = 347 +Wiimote4ConnectModifier = 1 +LoadStateSlot1 = 340 +LoadStateSlot1Modifier = 0 +LoadStateSlot2 = 341 +LoadStateSlot2Modifier = 0 +LoadStateSlot3 = 342 +LoadStateSlot3Modifier = 0 +LoadStateSlot4 = 343 +LoadStateSlot4Modifier = 0 +LoadStateSlot5 = 344 +LoadStateSlot5Modifier = 0 +LoadStateSlot6 = 345 +LoadStateSlot6Modifier = 0 +LoadStateSlot7 = 346 +LoadStateSlot7Modifier = 0 +LoadStateSlot8 = 347 +LoadStateSlot8Modifier = 0 +SaveStateSlot1 = 340 +SaveStateSlot1Modifier = 4 +SaveStateSlot2 = 341 +SaveStateSlot2Modifier = 4 +SaveStateSlot3 = 342 +SaveStateSlot3Modifier = 4 +SaveStateSlot4 = 343 +SaveStateSlot4Modifier = 4 +SaveStateSlot5 = 344 +SaveStateSlot5Modifier = 4 +SaveStateSlot6 = 345 +SaveStateSlot6Modifier = 4 +SaveStateSlot7 = 346 +SaveStateSlot7Modifier = 4 +SaveStateSlot8 = 347 +SaveStateSlot8Modifier = 4 +LoadLastState1 = 0 +LoadLastState1Modifier = 0 +LoadLastState2 = 0 +LoadLastState2Modifier = 0 +LoadLastState3 = 0 +LoadLastState3Modifier = 0 +LoadLastState4 = 0 +LoadLastState4Modifier = 0 +LoadLastState5 = 0 +LoadLastState5Modifier = 0 +LoadLastState6 = 0 +LoadLastState6Modifier = 0 +LoadLastState7 = 0 +LoadLastState7Modifier = 0 +LoadLastState8 = 0 +LoadLastState8Modifier = 0 +SaveFirstState = 0 +SaveFirstStateModifier = 0 +UndoLoadState = 351 +UndoLoadStateModifier = 0 +UndoSaveState = 351 +UndoSaveStateModifier = 4 +[Display] +FullscreenResolution = Auto +Fullscreen = False +RenderToMain = False +RenderWindowXPos = -1 +RenderWindowYPos = -1 +RenderWindowWidth = 640 +RenderWindowHeight = 480 +RenderWindowAutoSize = False +KeepWindowOnTop = False +ProgressiveScan = False +DisableScreenSaver = True +ForceNTSCJ = False +[GameList] +ListDrives = False +ListWad = True +ListWii = True +ListGC = True +ListJap = True +ListPal = True +ListUsa = True +ListFrance = True +ListItaly = True +ListKorea = True +ListTaiwan = True +ListUnknown = True +ListSort = 3 +ListSortSecondary = 0 +[Movie] +PauseMovie = False +Author = +[DSP] +EnableJIT = True +DumpAudio = False +Backend = OpenSLES +Volume = 100 diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index d8559c1393..2cc19d3955 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -3,8 +3,10 @@ package org.dolphinemu.dolphinemu; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import android.os.Environment; +import android.preference.PreferenceManager; import android.util.DisplayMetrics; import android.util.Log; import android.view.InputDevice; @@ -91,7 +93,8 @@ public class DolphinEmulator extends Activity // Copy assets if needed java.io.File file = new java.io.File( - Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "NoBanner.png"); + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini"); if(!file.exists()) { CopyAsset("ButtonA.png", @@ -108,7 +111,15 @@ public class DolphinEmulator extends Activity "dolphin-emu" + File.separator + "NoBanner.png"); CopyAsset("GCPadNew.ini", Environment.getExternalStorageDirectory()+File.separator+ - "dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini"); + "dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini"); + CopyAsset("GCPadNew.ini", + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "Config" + File.separator +"Dolphin.ini"); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = prefs.edit(); + editor.clear(); + editor.commit(); } } } @@ -129,7 +140,7 @@ public class DolphinEmulator extends Activity String FileName = data.getStringExtra("Select"); GLview = new NativeGLSurfaceView(this); this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "OGL"); + String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer"); if (backend.equals("OGL")) GLview.SetDimensions(screenHeight, screenWidth); else