Merge branch 'development' into development

src/preload/lyrics.ts

@@ -26,9 +26,34 @@ const getRemoteLyricsByRemoteId = (id: LyricGetQuery) => {
     return result;
 };
 
+const convertFurigana = (text: string): Promise<string> => {
+    return ipcRenderer.invoke('lyric-convert-furigana', text);
+};
+
+const convertFuriganaFragment = (text: string): Promise<string> => {
+    return ipcRenderer.invoke('lyric-convert-furigana-fragment', text);
+};
+
+const parseLyricsTextTokens = (text: string) => {
+    return ipcRenderer.invoke('lyric-parse-text-tokens', text);
+};
+
+const convertRomaji = (text: string): Promise<string> => {
+    return ipcRenderer.invoke('lyric-convert-romaji', text);
+};
+
+const convertRomajiTokens = (text: string) => {
+    return ipcRenderer.invoke('lyric-convert-romaji-tokens', text);
+};
+
 export const lyrics = {
+    convertFurigana,
+    convertFuriganaFragment,
+    convertRomaji,
+    convertRomajiTokens,
     getRemoteLyricsByRemoteId,
     getRemoteLyricsBySong,
+    parseLyricsTextTokens,
     searchRemoteLyrics,
 };
 

src/preload/mpv-player.ts

@@ -102,6 +102,10 @@ const getAudioDevices = async () => {
     return ipcRenderer.invoke('player-get-audio-devices');
 };
 
+const rendererTrackEnded = (cb: () => void) => {
+    ipcRenderer.on('renderer-player-track-ended', () => cb());
+};
+
 const rendererAutoNext = (cb: (data: PlayerData) => void) => {
     ipcRenderer.on('renderer-player-auto-next', (_, data) => cb(data));
 };
@@ -174,6 +178,10 @@ const rendererPlayerFallback = (cb: (data: boolean) => void) => {
     ipcRenderer.on('renderer-player-fallback', (_, data) => cb(data));
 };
 
+const rendererMpvReconnect = (cb: () => void) => {
+    ipcRenderer.on('renderer-mpv-reconnect', () => cb());
+};
+
 export const mpvPlayer = {
     autoNext,
     cleanup,
@@ -205,6 +213,7 @@ export const mpvPlayerListener = {
     rendererAutoNext,
     rendererCurrentTime,
     rendererError,
+    rendererMpvReconnect,
     rendererNext,
     rendererPause,
     rendererPlay,
@@ -217,6 +226,7 @@ export const mpvPlayerListener = {
     rendererStop,
     rendererToggleRepeat,
     rendererToggleShuffle,
+    rendererTrackEnded,
     rendererVolumeDown,
     rendererVolumeMute,
     rendererVolumeUp,