diff --git a/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt
index 2ac14cc21..157bc89b4 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt
@@ -9,7 +9,7 @@ object PlaybackSpeedPatchFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("F"),
customFingerprint = { methodDef, _ ->
- methodDef.definingClass == "Lapp/revanced/music/patches/misc/PlaybackSpeedPatch;"
+ methodDef.definingClass == "Lapp/revanced/music/patches/video/PlaybackSpeedPatch;"
&& methodDef.name == "overrideSpeed"
}
)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/patch/OverrideSpeedHookPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
index 530922f33..e7e6b3ead 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
@@ -14,7 +14,7 @@ import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeed
import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeedParentFingerprint
import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeedPatchFingerprint
import app.revanced.util.integrations.Constants.MUSIC_INTEGRATIONS_PATH
-import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
+import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
import com.android.tools.smali.dexlib2.dexbacked.reference.DexBackedMethodReference
@@ -103,7 +103,7 @@ class OverrideSpeedHookPatch : BytecodePatch(
internal companion object {
const val INTEGRATIONS_PLAYBACK_SPEED_CLASS_DESCRIPTOR =
- "$MUSIC_MISC_PATH/PlaybackSpeedPatch;"
+ "$MUSIC_VIDEO_PATH/PlaybackSpeedPatch;"
const val INTEGRATIONS_VIDEO_HELPER_CLASS_DESCRIPTOR =
"$MUSIC_INTEGRATIONS_PATH/utils/VideoHelpers;"
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
similarity index 88%
rename from src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
index 06b53157b..8b4af0fca 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.quality.fingerprints
+package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
similarity index 90%
rename from src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
index 9c3db9f61..f99d7e1d7 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.quality.fingerprints
+package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/UserQualityChangeFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/UserQualityChangeFingerprint.kt
similarity index 87%
rename from src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/UserQualityChangeFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/UserQualityChangeFingerprint.kt
index 2d06f16d1..9be51d9b0 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/UserQualityChangeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/UserQualityChangeFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.quality.fingerprints
+package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.Opcode
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/music/video/quality/patch/VideoQualityPatch.kt
similarity index 91%
rename from src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
rename to src/main/kotlin/app/revanced/patches/music/video/quality/patch/VideoQualityPatch.kt
index 596077fda..45c6f1115 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/quality/patch/VideoQualityPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.quality.patch
+package app.revanced.patches.music.video.quality.patch
import app.revanced.extensions.exception
import app.revanced.extensions.findMutableMethodOf
@@ -12,15 +12,15 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.misc.quality.fingerprints.MusicVideoQualitySettingsFingerprint
-import app.revanced.patches.music.misc.quality.fingerprints.MusicVideoQualitySettingsParentFingerprint
-import app.revanced.patches.music.misc.quality.fingerprints.UserQualityChangeFingerprint
import app.revanced.patches.music.utils.annotations.MusicCompatibility
import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.music.video.information.patch.VideoInformationPatch
+import app.revanced.patches.music.video.quality.fingerprints.MusicVideoQualitySettingsFingerprint
+import app.revanced.patches.music.video.quality.fingerprints.MusicVideoQualitySettingsParentFingerprint
+import app.revanced.patches.music.video.quality.fingerprints.UserQualityChangeFingerprint
import app.revanced.util.enum.CategoryType
-import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
+import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -113,8 +113,9 @@ class VideoQualityPatch : BytecodePatch(
} ?: throw MusicVideoQualitySettingsParentFingerprint.exception
VideoInformationPatch.injectCall("$INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;)V")
+
SettingsPatch.addMusicPreference(
- CategoryType.MISC,
+ CategoryType.VIDEO,
"revanced_enable_save_video_quality",
"true"
)
@@ -123,7 +124,7 @@ class VideoQualityPatch : BytecodePatch(
private companion object {
const val INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR =
- "$MUSIC_MISC_PATH/VideoQualityPatch;"
+ "$MUSIC_VIDEO_PATH/VideoQualityPatch;"
private lateinit var qIndexMethodName: String
private lateinit var qualityReference: Reference
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt
similarity index 89%
rename from src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt
index 8655610c5..7e050a23c 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.speed.fingerprints
+package app.revanced.patches.music.video.speed.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt
similarity index 87%
rename from src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt
index 134fd88cc..93ab1e63e 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetParentFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.speed.fingerprints
+package app.revanced.patches.music.video.speed.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/speed/patch/PlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/music/video/speed/patch/PlaybackSpeedPatch.kt
similarity index 86%
rename from src/main/kotlin/app/revanced/patches/music/misc/speed/patch/PlaybackSpeedPatch.kt
rename to src/main/kotlin/app/revanced/patches/music/video/speed/patch/PlaybackSpeedPatch.kt
index a74385b32..8ea7d8912 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/speed/patch/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/video/speed/patch/PlaybackSpeedPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.speed.patch
+package app.revanced.patches.music.video.speed.patch
import app.revanced.extensions.exception
import app.revanced.patcher.annotation.Description
@@ -10,13 +10,13 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.misc.speed.fingerprints.PlaybackSpeedBottomSheetFingerprint
-import app.revanced.patches.music.misc.speed.fingerprints.PlaybackSpeedBottomSheetParentFingerprint
import app.revanced.patches.music.utils.annotations.MusicCompatibility
import app.revanced.patches.music.utils.overridespeed.patch.OverrideSpeedHookPatch
import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
+import app.revanced.patches.music.video.speed.fingerprints.PlaybackSpeedBottomSheetFingerprint
+import app.revanced.patches.music.video.speed.fingerprints.PlaybackSpeedBottomSheetParentFingerprint
import app.revanced.util.enum.CategoryType
-import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
+import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch
@@ -55,7 +55,7 @@ class PlaybackSpeedPatch : BytecodePatch(
} ?: throw PlaybackSpeedBottomSheetParentFingerprint.exception
SettingsPatch.addMusicPreference(
- CategoryType.MISC,
+ CategoryType.VIDEO,
"revanced_enable_save_playback_speed",
"false"
)
@@ -64,6 +64,6 @@ class PlaybackSpeedPatch : BytecodePatch(
private companion object {
const val INTEGRATIONS_CLASS_DESCRIPTOR =
- "$MUSIC_MISC_PATH/PlaybackSpeedPatch;"
+ "$MUSIC_VIDEO_PATH/PlaybackSpeedPatch;"
}
}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/util/enum/CategoryType.kt b/src/main/kotlin/app/revanced/util/enum/CategoryType.kt
index 03cae4632..467dfc7e7 100644
--- a/src/main/kotlin/app/revanced/util/enum/CategoryType.kt
+++ b/src/main/kotlin/app/revanced/util/enum/CategoryType.kt
@@ -7,5 +7,6 @@ internal enum class CategoryType(val value: String, var added: Boolean) {
GENERAL("general", false),
MISC("misc", false),
NAVIGATION("navigation", false),
- PLAYER("player", false)
+ PLAYER("player", false),
+ VIDEO("video", false)
}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/util/integrations/Constants.kt b/src/main/kotlin/app/revanced/util/integrations/Constants.kt
index 0e39de890..daa3bc0da 100644
--- a/src/main/kotlin/app/revanced/util/integrations/Constants.kt
+++ b/src/main/kotlin/app/revanced/util/integrations/Constants.kt
@@ -28,5 +28,7 @@ internal object Constants {
const val MUSIC_MISC_PATH = "$MUSIC_PATCHES_PATH/misc"
const val MUSIC_NAVIGATION = "$MUSIC_PATCHES_PATH/navigation/NavigationPatch;"
const val MUSIC_PLAYER = "$MUSIC_PATCHES_PATH/player/PlayerPatch;"
+ const val MUSIC_VIDEO_PATH = "$MUSIC_PATCHES_PATH/video"
+
const val MUSIC_UTILS_PATH = "$MUSIC_PATCHES_PATH/utils"
}
\ No newline at end of file
diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml
index 1366e6c1e..1a529df68 100644
--- a/src/main/resources/music/settings/host/values/strings.xml
+++ b/src/main/resources/music/settings/host/values/strings.xml
@@ -7,6 +7,7 @@
Miscellaneous
Navigation
Player
+ Video
Filter component names by line-seperated
Edit custom filter
Enables custom filters