diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/Buttons.hx | 10 | ||||
| -rw-r--r-- | src/client/Main.hx | 9 | ||||
| -rw-r--r-- | src/client/Player.hx | 7 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/client/Buttons.hx b/src/client/Buttons.hx index cf1246d..aa7c1b2 100644 --- a/src/client/Buttons.hx +++ b/src/client/Buttons.hx @@ -323,13 +323,13 @@ class Buttons { } updateHotkeysBtn(); - final removeBtn = ge("#removeVideoBtn"); + final removeBtn = ge("#removePlayerBtn"); removeBtn.onclick = e -> { - final hasVideo = main.toggleVideoElement(); - if (hasVideo || main.isListEmpty()) { - removeBtn.innerText = Lang.get("removeVideo"); + final isActive = main.toggleVideoElement(); + if (isActive) { + removeBtn.innerText = Lang.get("removePlayer"); } else { - removeBtn.innerText = Lang.get("addVideo"); + removeBtn.innerText = Lang.get("restorePlayer"); } } final setVideoUrlBtn = ge("#setVideoUrlBtn"); diff --git a/src/client/Main.hx b/src/client/Main.hx index 7b8228e..a7417fb 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -30,6 +30,7 @@ class Main { public final settings:ClientSettings; public var isSyncActive = true; public var forceSyncNextTick = false; + public var isVideoEnabled = true; public final host:String; public var globalIp(default, null) = ""; public var isPlaylistOpen = true; @@ -359,11 +360,13 @@ class Main { } public function toggleVideoElement():Bool { - if (player.hasVideo()) player.removeVideo(); - else if (!player.isListEmpty()) { + isVideoEnabled = !isVideoEnabled; + if (!isVideoEnabled && player.hasVideo()) { + player.removeVideo(); + } else if (isVideoEnabled && !player.isListEmpty()) { player.setVideo(player.getItemPos()); } - return player.hasVideo(); + return isVideoEnabled; } public function isListEmpty():Bool { diff --git a/src/client/Player.hx b/src/client/Player.hx index 0407ab2..6113c07 100644 --- a/src/client/Player.hx +++ b/src/client/Player.hx @@ -127,12 +127,17 @@ class Player { addActiveLabel(videoList.pos); isLoaded = false; - player.loadVideo(item); + if (main.isVideoEnabled) { + player.loadVideo(item); + } else { + onCanBePlayed(); + } JsApi.fireVideoChangeEvents(item); ge("#currenttitle").textContent = item.title; } public function changeVideoSrc(src:String):Void { + if (!main.isVideoEnabled) return; if (player == null) return; final item = videoList.getCurrentItem() ?? return; player.loadVideo({ |