From 47dc607d28e1a01a53a888356e786d4d8d4182d5 Mon Sep 17 00:00:00 2001
From: Nikita Krupin <krupin.nikita0110@gmail.com>
Date: Sun, 31 Jul 2022 23:02:04 -0400
Subject: [PATCH] add timeouts to cleanup, remove ugly box shadow i forgor
 about

---
 NUXT/components/Player/index.vue           | 13 +++++++------
 NUXT/components/Player/sponsorblock.vue    |  1 -
 android/.idea/deploymentTargetDropDown.xml | 17 -----------------
 3 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 android/.idea/deploymentTargetDropDown.xml

diff --git a/NUXT/components/Player/index.vue b/NUXT/components/Player/index.vue
index f2a9513..7108be8 100644
--- a/NUXT/components/Player/index.vue
+++ b/NUXT/components/Player/index.vue
@@ -441,7 +441,7 @@ export default {
 
     // TODO: detect this.isMusic from the video or channel metadata instead of just SB segments
 
-    vid.addEventListener("loadeddata", (e) => {
+    this.$refs.player.addEventListener("loadeddata", (e) => {
       // console.log(e);
       // if (vid.networkState === vid.NETWORK_LOADING) {
       //   // The user agent is actively trying to download data.
@@ -465,7 +465,7 @@ export default {
 
         this.$refs.player.loop = this.$store.state.player.loop;
         this.$refs.audio.loop = this.$store.state.player.loop;
-        vid.addEventListener("timeupdate", () => {
+        this.$refs.player.addEventListener("timeupdate", () => {
           if (!this.seeking) this.progress = vid.currentTime; // for seekbar
 
           // console.log("sb check", this.blocks);
@@ -488,7 +488,7 @@ export default {
         });
         // TODO: handle video ending with a "replay" button instead of <playpause /> if not on loop
         // TODO: split buffering into multiple sections as it should be for back/forth scrubbing
-        vid.addEventListener("progress", () => {
+        this.$refs.player.addEventListener("progress", () => {
           if (this.bufferingDetected) {
             this.$refs.audio.currentTime = vid.currentTime;
             clearTimeout(this.bufferingDetected);
@@ -501,7 +501,7 @@ export default {
         // buffering detection & sync
         let threshold = 250; //ms after which user perceives buffering
 
-        vid.addEventListener("waiting", () => {
+        this.$refs.player.addEventListener("waiting", () => {
           if (!vid.paused) {
             this.bufferingDetected = setTimeout(() => {
               this.bufferingDetected = true;
@@ -510,7 +510,7 @@ export default {
             }, threshold);
           }
         });
-        vid.addEventListener("playing", () => {
+        this.$refs.player.addEventListener("playing", () => {
           if (this.bufferingDetected != false) {
             clearTimeout(this.bufferingDetected);
             this.$refs.audio.currentTime = vid.currentTime;
@@ -531,8 +531,9 @@ export default {
   },
   methods: {
     cleanup() {
-      this.xhr.abort();
+      if (this.xhr) this.xhr.abort();
       if (this.isFullscreen) this.exitFullscreen();
+      if (this.bufferingDetected) clearTimeout(this.bufferingDetected);
       screen.orientation.removeEventListener("change");
       this.$refs.player.removeEventListener("loadeddata");
       this.$refs.player.removeEventListener("timeupdate");
diff --git a/NUXT/components/Player/sponsorblock.vue b/NUXT/components/Player/sponsorblock.vue
index 1651509..c51cbc9 100644
--- a/NUXT/components/Player/sponsorblock.vue
+++ b/NUXT/components/Player/sponsorblock.vue
@@ -10,7 +10,6 @@
         pointer-events: none;
         background: transparent;
         transform: translateY(50%);
-        box-shadow: 0 0 1rem 1rem red;
       "
       :class="!fullscreen || controls ? '' : 'invisible'"
       :background-color="colors[block.category]"
diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 4acec40..0000000
--- a/android/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="adb-97QAY11P1S-NELaqI._adb-tls-connect._tcp." />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-01T02:55:54.306038Z" />
-  </component>
-</project>
\ No newline at end of file