GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 22:15:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin updates for compatibility with the Android R SDK preview

Browse Source
This commit is contained in:
Billy Laws 2020-06-15 16:37:28 +01:00 committed by ◱ PixelyIon
parent 68fcb2e4e5
commit af709efb15
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/emu/skyline/EmulationActivity.kt
View File

@ -189,23 +189,23 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback {
/** /**
* This sets [surface] to [holder].surface and passes it into libskyline * This sets [surface] to [holder].surface and passes it into libskyline
*/ */
override fun surfaceCreated(holder : SurfaceHolder?) { override fun surfaceCreated(holder : SurfaceHolder) {
Log.d("surfaceCreated", "Holder: ${holder.toString()}") Log.d("surfaceCreated", "Holder: ${holder.toString()}")
surface = holder!!.surface surface = holder.surface
setSurface(surface) setSurface(surface)
} }
/** /**
* This is purely used for debugging surface changes * This is purely used for debugging surface changes
*/ */
override fun surfaceChanged(holder : SurfaceHolder?, format : Int, width : Int, height : Int) { override fun surfaceChanged(holder : SurfaceHolder, format : Int, width : Int, height : Int) {
Log.d("surfaceChanged", "Holder: ${holder.toString()}, Format: $format, Width: $width, Height: $height") Log.d("surfaceChanged", "Holder: ${holder.toString()}, Format: $format, Width: $width, Height: $height")
} }
/** /**
* This sets [surface] to null and passes it into libskyline * This sets [surface] to null and passes it into libskyline
*/ */
override fun surfaceDestroyed(holder : SurfaceHolder?) { override fun surfaceDestroyed(holder : SurfaceHolder) {
Log.d("surfaceDestroyed", "Holder: ${holder.toString()}") Log.d("surfaceDestroyed", "Holder: ${holder.toString()}")
surface = null surface = null
setSurface(surface) setSurface(surface)

2
app/src/main/java/emu/skyline/loader/RomFile.kt
View File

@ -105,7 +105,7 @@ class AppEntry : Serializable {
output.writeUTF(author) output.writeUTF(author)
output.writeBoolean(icon != null) output.writeBoolean(icon != null)
if (icon != null) if (icon != null)
icon!!.compress(Bitmap.CompressFormat.WEBP, 100, output) icon!!.compress(Bitmap.CompressFormat.WEBP_LOSSY, 100, output)
} }
/** /**