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

NEVER. CODE. AT. FOUR. AYE. EM. AGAIN.

Browse source
This commit is contained in:
maikirakiwi 2022-07-08 22:56:19 -07:00
parent 357996db60
commit 07dff3f610
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/renderer/main/vueapp.js
View file

@ -925,7 +925,7 @@ const app = new Vue({
}) })
this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => { this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => {
self.lyriccurrenttime = self.mk.currentPlaybackTime + (app.lyricOffset / 2) self.lyriccurrenttime = self.mk.currentPlaybackTime - app.lyricOffset
this.currentSongInfo = a this.currentSongInfo = a
self.playerLCD.playbackDuration = (self.mk.currentPlaybackTime) self.playerLCD.playbackDuration = (self.mk.currentPlaybackTime)
// wsapi // wsapi
@ -3186,18 +3186,20 @@ const app = new Vue({
let raw_lines = lyric_isolated.getElementsByClassName("col-xs-6 col-sm-6 col-md-6 col-ml-6 col-lg-6") let raw_lines = lyric_isolated.getElementsByClassName("col-xs-6 col-sm-6 col-md-6 col-ml-6 col-lg-6")
let applied = 0; let applied = 0;
for (let i = 1; applied < app.lyrics.length; i+=2) { for (let i = 1; applied < app.lyrics.length; i+=2) { // Start on odd elements because even ones are original.
if (app.lyrics[applied].line === "lrcInstrumental") { if (app.lyrics[applied].line === raw_lines[i].childNodes[0].childNodes[0].textContent) {
app.lyrics[applied+1].translation = raw_lines[i].childNodes[0].childNodes[0].textContent; // Do Nothing
applied +=2;
}
else if (app.lyrics[applied].line === raw_lines[i].childNodes[0].childNodes[0].textContent) {
// Skip this line
applied +=1; applied +=1;
} }
else { else {
app.lyrics[applied].translation = raw_lines[i].childNodes[0].childNodes[0].textContent; if (app.lyrics[applied].line === "lrcInstrumental") {
applied +=1; app.lyrics[applied+1].translation = raw_lines[i].childNodes[0].childNodes[0].textContent;
applied +=2;
}
else {
app.lyrics[applied].translation = raw_lines[i].childNodes[0].childNodes[0].textContent;
applied +=1;
}
} }
} }
}) })

4
src/renderer/views/components/settings-window.ejs
View file

@ -776,8 +776,8 @@
<option value='bengali'>Bengali</option> <option value='bengali'>Bengali</option>
<option value='bosnian'>Bosnian</option> <option value='bosnian'>Bosnian</option>
<option value='bulgarian'>Bulgarian</option> <option value='bulgarian'>Bulgarian</option>
<option value='simplified chinese'>Chinese (Simplified)</option> <option value='chinese'>Chinese (Simplified)</option>
<option value='traditional chinese'>Chinese (Traditional)</option> <option value='chinese-trad'>Chinese (Traditional)</option>
<option value='croatian'>Croatian</option> <option value='croatian'>Croatian</option>
<option value='czech'>Czech</option> <option value='czech'>Czech</option>
<option value='danish'>Danish</option> <option value='danish'>Danish</option>