From a5cee365720c2405894185fb557cb2be0a34b2c7 Mon Sep 17 00:00:00 2001 From: reduplicated <110570621+reduplicated@users.noreply.github.com> Date: Fri, 4 Nov 2022 19:17:07 +0100 Subject: [PATCH] removed prints --- .../main/java/com/lagradost/cloudstream3/CommonActivity.kt | 2 +- .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt | 1 - .../com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt | 1 + .../cloudstream3/ui/player/PlayerGeneratorViewModel.kt | 1 - .../main/java/com/lagradost/cloudstream3/utils/AniSkip.kt | 5 +---- app/src/main/res/layout/player_custom_layout.xml | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt index 63895cab..af04a1a2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt @@ -338,7 +338,7 @@ object CommonActivity { PlayerEventType.SkipOp } KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> { - PlayerEventType.SkipOp + PlayerEventType.SkipCurrentChapter } KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation PlayerEventType.PlayPauseToggle diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt index dac384b1..d132406c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt @@ -1039,7 +1039,6 @@ class CS3IPlayer : IPlayer { override fun addTimeStamps(timeStamps: List) { lastTimeStamps = timeStamps timeStamps.forEach { timestamp -> - println("ADDING: $timestamp") exoPlayer?.createMessage { _, payload -> if (payload is EpisodeSkip.SkipStamp) // this should always be true onTimestampInvoked?.invoke(payload) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt index 70dd53b3..450711fa 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt @@ -186,6 +186,7 @@ class GeneratorPlayer : FullScreenPlayer() { ), ) } + player.addTimeStamps(listOf()) // clear stamps } private fun sortLinks(useQualitySettings: Boolean = true): List> { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt index 49fcde60..4f16e9f6 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt @@ -121,7 +121,6 @@ class PlayerGeneratorViewModel : ViewModel() { private var currentStampJob: Job? = null fun loadStamps(duration: Long) { - println("Starting loadStamps with duration = $duration") //currentStampJob?.cancel() currentStampJob = ioSafe { val meta = generator?.getCurrent() diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt index 4e3de770..07233871 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt @@ -37,7 +37,7 @@ object EpisodeSkip { private val cachedStamps = HashMap>() private fun shouldSkipToNextEpisode(endMs: Long, episodeDurationMs: Long): Boolean { - return (episodeDurationMs - endMs) < 12_000L + return episodeDurationMs - endMs < 12_000L } suspend fun getStamps( @@ -94,11 +94,8 @@ object AniSkip { Log.i(TAG, "Requesting $url") val a = app.get(url) - //println("GOT RESPONSE:::.") val res = a.parsed() Log.i(TAG, "Found ${res.found} with ${res.results?.size} results") - - // Log.i("AniSkip", "Response = $res") if (res.found) res.results else null } catch (t: Throwable) { Log.i(TAG, "error = ${t.message}") diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml index d571d7ca..95bf3b3e 100644 --- a/app/src/main/res/layout/player_custom_layout.xml +++ b/app/src/main/res/layout/player_custom_layout.xml @@ -334,7 +334,7 @@ app:layout_constraintEnd_toEndOf="parent" app:strokeColor="@color/white" app:strokeWidth="1dp" - android:text="Skip Opening" /> + tools:text="Skip Opening" />