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

[Android] Add video logging

This commit is contained in:
zilmar 2017-04-29 18:31:41 +10:00
parent ef154078df
commit 05cd6eac3c
6 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Android/res/values/strings.xml
View File

@ -68,8 +68,10 @@
<string name="logging">Logging</string>
<string name="project64core">Project64 Core</string>
<string name="AudioPlugin">Audio Plugin</string>
<string name="VideoPlugin">Video Plugin</string>
<string name="logging_project64core">Logging - Project64 Core</string>
<string name="logging_Audio">Logging - Audio</string>
<string name="logging_Video">Logging - Video</string>
<string name="TraceError">Error</string>
<string name="TraceWarning">Warning</string>
<string name="TraceNotice">Notice</string>
@ -98,6 +100,18 @@
<string name="TraceUserInterface">User Interface</string>
<string name="TraceRomList">Rom List</string>
<string name="TraceExceptionHandler">Exception Handler</string>
<string name="TraceVideoMD5">MD5</string>
<string name="TraceVideoPath">Path</string>
<string name="TraceVideoSettings">Settings</string>
<string name="TraceVideoUnknown">Unknown</string>
<string name="TraceVideoGlide64">Glide64</string>
<string name="TraceVideoInterface">Interface</string>
<string name="TraceVideoResolution">Resolution</string>
<string name="TraceVideoGlitch">Glitch</string>
<string name="TraceVideoTLUT">TLUT</string>
<string name="TraceVideoPNG">PNG</string>
<string name="TraceVideoOGLWrapper">OGL Wrapper</string>
<string name="TraceVideoRDP">RDP</string>
<string name="TraceAudioInitShutdown">Init/Shutdown</string>
<string name="TraceAudioAudioInterface">Interface</string>
<string name="CpuType">CPU core style</string>

16
Android/res/xml/logging_video.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoMD5" android:title="@string/TraceVideoMD5" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoThread" android:title="@string/TraceAudioAudioInterface" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoPath" android:title="@string/TraceVideoPath" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoSettings" android:title="@string/TraceVideoSettings" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoUnknown" android:title="@string/TraceVideoUnknown" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoGlide64" android:title="@string/TraceVideoGlide64" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoInterface" android:title="@string/TraceVideoInterface" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoResolution" android:title="@string/TraceVideoResolution" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoGlitch" android:title="@string/TraceVideoGlitch" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceTraceVideoRDP" android:title="@string/TraceVideoRDP" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoTLUT" android:title="@string/TraceVideoTLUT" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoPNG" android:title="@string/TraceVideoPNG" />
<emu.project64.settings.LogLevelPreference android:key="Debugger_TraceVideoOGLWrapper" android:title="@string/TraceVideoOGLWrapper" />
</PreferenceScreen>

3
Android/res/xml/settings_advanced.xml
View File

@ -42,6 +42,9 @@
<Preference
android:title="@string/project64core"
android:key="logging_core" />
<Preference
android:title="@string/VideoPlugin"
android:key="logging_video" />
<Preference
android:title="@string/AudioPlugin"
android:key="logging_audio" />

28
Android/src/emu/project64/settings/LoggingVideo.java Normal file
View File

@ -0,0 +1,28 @@
/****************************************************************************
* *
* Project64 - A Nintendo 64 emulator. *
* http://www.pj64-emu.com/ *
* Copyright (C) 2012 Project64. All rights reserved. *
* *
* License: *
* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html *
* *
****************************************************************************/
package emu.project64.settings;
import emu.project64.R;
public class LoggingVideo extends BaseSettingsFragment
{
@Override
protected int getXml()
{
return R.xml.logging_video;
}
@Override
protected int getTitleId()
{
return R.string.logging_Video;
}
}

26
Android/src/emu/project64/settings/SettingsActivity.java
View File

@ -91,6 +91,19 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
.putString("Debugger_TraceUserInterface",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceUserInterface.getValue())))
.putString("Debugger_TraceRomList",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceRomList.getValue())))
.putString("Debugger_TraceExceptionHandler",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceExceptionHandler.getValue())))
.putString("Debugger_TraceVideoMD5",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_MD5.getValue())))
.putString("Debugger_TraceVideoThread",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Thread.getValue())))
.putString("Debugger_TraceVideoPath",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Path.getValue())))
.putString("Debugger_TraceVideoSettings",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Settings.getValue())))
.putString("Debugger_TraceVideoUnknown",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Unknown.getValue())))
.putString("Debugger_TraceVideoGlide64",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Glide64.getValue())))
.putString("Debugger_TraceVideoInterface",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Interface.getValue())))
.putString("Debugger_TraceVideoResolution",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Resolution.getValue())))
.putString("Debugger_TraceVideoGlitch",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Glitch.getValue())))
.putString("Debugger_TraceTraceVideoRDP",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_VideoRDP.getValue())))
.putString("Debugger_TraceVideoTLUT",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_TLUT.getValue())))
.putString("Debugger_TraceVideoPNG",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_PNG.getValue())))
.putString("Debugger_TraceVideoOGLWrapper",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_OGLWrapper.getValue())))
.putString("Debugger_TraceAudioInitShutdown",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstAudioSettings.getValue() + AudioSettingID.Logging_LogAudioInitShutdown.getValue())))
.putString("Debugger_TraceAudioAudioInterface",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstAudioSettings.getValue() + AudioSettingID.Logging_LogAudioInterface.getValue())))
.putString("video_screenResolution",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Resolution.getValue())))
@ -175,6 +188,19 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
else if (key.equals("Debugger_TraceUserInterface")) { NativeExports.SettingsSaveDword(SettingsID.Debugger_TraceUserInterface.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceRomList")) { NativeExports.SettingsSaveDword(SettingsID.Debugger_TraceRomList.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceExceptionHandler")) { NativeExports.SettingsSaveDword(SettingsID.Debugger_TraceExceptionHandler.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoMD5")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_MD5.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoThread")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Thread.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoPath")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Path.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoSettings")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Settings.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoUnknown")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Unknown.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoGlide64")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Glide64.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoInterface")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Interface.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoResolution")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Resolution.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoGlitch")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_Glitch.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceTraceVideoRDP")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_VideoRDP.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoTLUT")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_TLUT.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoPNG")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_PNG.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceVideoOGLWrapper")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Logging_OGLWrapper.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceAudioInitShutdown")) { NativeExports.SettingsSaveDword(SettingsID.FirstAudioSettings.getValue() + AudioSettingID.Logging_LogAudioInitShutdown.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("Debugger_TraceAudioAudioInterface")) { NativeExports.SettingsSaveDword(SettingsID.FirstAudioSettings.getValue() + AudioSettingID.Logging_LogAudioInterface.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }
else if (key.equals("video_screenResolution")) { NativeExports.SettingsSaveDword(SettingsID.FirstGfxSettings.getValue() + VideoSettingID.Set_Resolution.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }

2
Source/Project64-core/Settings/SettingsClass.cpp
View File

@ -345,7 +345,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
AddHandler(Plugin_CONT_Current, new CSettingTypeApplication("Plugin", "Controller Dll", "Input\\PJ64_NRage.dll"));
#else
AddHandler(Plugin_RSP_Current, new CSettingTypeApplication("Plugin", "RSP Dll", "libProject64-rsp-hle.so"));
AddHandler(Plugin_GFX_Current, new CSettingTypeApplication("Plugin", "Graphics Dll", "libProject64-gfx-glide64.so"));
AddHandler(Plugin_GFX_Current, new CSettingTypeApplication("Plugin", "Graphics Dll", "libProject64-gfx.so"));
AddHandler(Plugin_AUDIO_Current, new CSettingTypeApplication("Plugin", "Audio Dll", "libProject64-audio-android.so"));
AddHandler(Plugin_CONT_Current, new CSettingTypeApplication("Plugin", "Controller Dll", "libProject64-input-android.so"));
#endif