okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "Revert "Volume customization"""

Browse source 
This reverts commit c3c3773637.
This commit is contained in:
Maikiwi 2022-01-22 20:56:34 -08:00
parent c3c3773637
commit 4da0e5e8a8
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/renderer/index.js
View file

@ -3007,17 +3007,17 @@ const app = new Vue({
}, },
volumeWheel(event) { volumeWheel(event) {
if (event.deltaY < 0) { if (event.deltaY < 0) {
if (this.mk.volume < 0.2) { if (this.mk.volume < 1) {
if (this.mk.volume <= 0.19) { if (this.mk.volume <= 0.9) {
this.mk.volume += 0.01 this.mk.volume += 0.1
} else { } else {
this.mk.volume = 0.2 this.mk.volume = 1
} }
} }
} else if (event.deltaY > 0) { } else if (event.deltaY > 0) {
if (this.mk.volume > 0) { if (this.mk.volume > 0) {
if (this.mk.volume >= 0.01) { if (this.mk.volume >= 0.1) {
this.mk.volume -= 0.01 this.mk.volume -= 0.1
} else { } else {
this.mk.volume = 0 this.mk.volume = 0
} }

2
src/renderer/index_old.html
View file

@ -82,7 +82,7 @@
</div> </div>
<div class="app-chrome--right"> <div class="app-chrome--right">
<div class="app-chrome-item volume display--large"> <div class="app-chrome-item volume display--large">
<input type="range" class="" step="0.01" min="0" max="0.2" v-model="mk.volume" <input type="range" class="" step="0.01" min="0" max="1" v-model="mk.volume"
v-if="typeof mk.volume != 'undefined'"> v-if="typeof mk.volume != 'undefined'">
</div> </div>
<div class="app-chrome-item generic"> <div class="app-chrome-item generic">

2
src/renderer/views/components/fullscreen.ejs
View file

@ -80,7 +80,7 @@
<div class="app-chrome-item volume display--large"> <div class="app-chrome-item volume display--large">
<div class="input-container"> <div class="input-container">
<button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button> <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
<input type="range" class="slider" @wheel="app.volumeWheel" step="0.01" min="0" max="0,2" v-model="app.mk.volume" <input type="range" class="slider" @wheel="app.volumeWheel" step="0.01" min="0" max="1" v-model="app.mk.volume"
v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()"> v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
</div> </div>
</div> </div>

4
src/renderer/views/main.ejs
View file

@ -142,7 +142,7 @@
<div class="app-chrome-item volume display--large"> <div class="app-chrome-item volume display--large">
<button class="volume-button--small volume" @click="muteButtonPressed()" <button class="volume-button--small volume" @click="muteButtonPressed()"
:class="{'active': this.cfg.audio.volume == 0}"></button> :class="{'active': this.cfg.audio.volume == 0}"></button>
<input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="0.2" <input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="1"
v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()"> v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()">
</div> </div>
<div class="app-chrome-item generic" v-if="false"> <div class="app-chrome-item generic" v-if="false">
@ -316,7 +316,7 @@
<div class="input-container"> <div class="input-container">
<button class="volume-button--small volume" @click="muteButtonPressed()" <button class="volume-button--small volume" @click="muteButtonPressed()"
:class="{'active': this.cfg.audio.volume == 0}"></button> :class="{'active': this.cfg.audio.volume == 0}"></button>
<input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="0.2" <input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="1"
v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" v-model="mk.volume" v-if="typeof mk.volume != 'undefined'"
@change="checkMuteChange()"> @change="checkMuteChange()">
</div> </div>

2
src/web-remote/views/index.ejs
View file

@ -173,7 +173,7 @@
<div class="player-volume-glyph decrease"></div> <div class="player-volume-glyph decrease"></div>
</div> </div>
<div class="col"> <div class="col">
<input type="range" class="web-slider volume-slider" max="0.2" min="0" step="0.01" <input type="range" class="web-slider volume-slider" max="1" min="0" step="0.01"
@input="setVolume($event.target.value)" :value="player.currentMediaItem.volume"> @input="setVolume($event.target.value)" :value="player.currentMediaItem.volume">
</div> </div>
<div class="col-auto"> <div class="col-auto">