diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 21d3c9c1..fe94dcf0 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -367,6 +367,7 @@ "settings.header.audio": "Audio", "settings.header.audio.description": "Adjust the audio settings for Cider.", "settings.option.audio.volumeStep": "Volume Step", + "settings.option.audio.advanced": "Advanced Volume Control", "settings.option.audio.maxVolume": "Max Volume", "settings.option.audio.changePlaybackRate": "Change Playback Rate", "settings.option.audio.playbackRate": "Playback Rate", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 2501414c..0f97ac99 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -297,7 +297,8 @@ const app = new Vue({ } }, formatVolumeTooltip() { - return this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + (Math.log10(this.mk.volume) * 20)).toFixed(2) + ' dB SPL' : (Math.log10(this.mk.volume) * 20).toFixed(2) + ' dBFS' + let advancedTooltip = this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + (Math.log10(this.mk.volume) * 20)).toFixed(2) + ' dB SPL' : (Math.log10(this.mk.volume) * 20).toFixed(2) + ' dBFS' + return this.cfg.audio.advanced ? advancedTooltip : (this.mk.volume * 100).toFixed(0) + '%' }, mainMenuVisibility(val, isContextMenu) { if(this.chrome.sidebarCollapsed && !isContextMenu) { diff --git a/src/renderer/style.less b/src/renderer/style.less index bf434bfb..c65e5afb 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1680,7 +1680,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } .lyric-line.active .verse.verse-active { - animation: lyricVerseAnimation 0.75s ease-in-out forwards; + opacity: 1; + transition: opacity 0.35s var(--appleEase); } .lyric-line:hover { @@ -1703,10 +1704,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .lyric-line.active { --bgSpeed: 1s; + opacity: 1; transform: scale(1); /*background: var(--keyColor);*/ - transition: transform 0.2s var(--appleEase); - animation: lyricVerseAnimation 1s ease-in-out forwards; + transition: transform 0.2s var(--appleEase), opacity 0.35s var(--appleEase); } .lyric-line:not(.active) { @@ -1788,16 +1789,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { display: flex; } -@keyframes lyricVerseAnimation { - 0% { - opacity: 0.6; - } - - 100% { - opacity: 1; - } -} - @keyframes lyricWaitingLine { 0% { opacity: 0.25; diff --git a/src/renderer/views/components/audio-controls.ejs b/src/renderer/views/components/audio-controls.ejs index 497f578a..e82ec798 100644 --- a/src/renderer/views/components/audio-controls.ejs +++ b/src/renderer/views/components/audio-controls.ejs @@ -35,6 +35,16 @@ v-model="maxVolume"/> +