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

fix android intent-filter. fix spurious maple warning

This commit is contained in:
Flyinghead 2019-07-13 15:30:10 +02:00
parent 326bc580ec
commit 1375536534
5 changed files with 57 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/hw/maple/maple_cfg.cpp
View File

@ -217,6 +217,9 @@ void mcfg_CreateDevices()
mcfg_Create((MapleDeviceType)settings.input.maple_expansion_devices[bus][0], bus, 0); mcfg_Create((MapleDeviceType)settings.input.maple_expansion_devices[bus][0], bus, 0);
break; break;
case MDT_None:
break;
default: default:
WARN_LOG(MAPLE, "Invalid device type %d for port %d", settings.input.maple_devices[bus], bus); WARN_LOG(MAPLE, "Invalid device type %d for port %d", settings.input.maple_devices[bus], bus);
break; break;

6
core/hw/maple/maple_devs.cpp
View File

@ -371,7 +371,7 @@ struct maple_sega_twinstick: maple_sega_controller
return 0x80; return 0x80;
} }
virtual const char *get_device_name() virtual const char *get_device_name() override
{ {
return maple_sega_twinstick_name; return maple_sega_twinstick_name;
} }
@ -396,7 +396,7 @@ struct maple_ascii_stick: maple_sega_controller
return kcode | 0xF800; return kcode | 0xF800;
} }
virtual MapleDeviceType get_device_type() virtual MapleDeviceType get_device_type() override
{ {
return MDT_AsciiStick; return MDT_AsciiStick;
} }
@ -405,7 +405,7 @@ struct maple_ascii_stick: maple_sega_controller
return 0x80; return 0x80;
} }
virtual const char *get_device_name() virtual const char *get_device_name() override
{ {
return maple_ascii_stick_name; return maple_ascii_stick_name;
} }

51
shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml
View File

@ -53,6 +53,57 @@
android:mimeType="*/*" android:mimeType="*/*"
android:pathPattern=".*\\.cue" android:pathPattern=".*\\.cue"
android:scheme="file" /> android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.LST"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.lst"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.BIN"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.bin"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.DAT"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.dat"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.ZIP"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.zip"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.7Z"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.7z"
android:scheme="file" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
</application> </application>

69
shell/android-studio/reicast/src/naomi/AndroidManifest.xml
View File

@ -1,69 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="com.reicast.emulator.Emulator">
<activity
android:name="com.reicast.emulator.NativeGLActivity"/>
<activity-alias
android:name="com.reicast.emulator.MainActivity"
android:targetActivity="com.reicast.emulator.NativeGLActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.LST"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.lst"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.BIN"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.bin"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.DAT"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.dat"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.ZIP"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.zip"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.7Z"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.7z"
android:scheme="file" />
</intent-filter>
</activity-alias>
</application>
</manifest>

14
shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml
View File

@ -1,14 +0,0 @@
<resources>
<string name="app_name" translatable="false">Flycast Naomi</string>
<string name="flavor" translatable="false">naomi</string>
<string-array name="images">
<item>bin</item>
<item>dat</item>
<item>lst</item>
<item>zip</item>
<item>7z</item>
</string-array>
</resources>