From 2913c0c7dec3b8fdb8160925197e91efd4f4c650 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 13 Mar 2022 11:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9F=B3=E9=A2=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E4=B8=8E=E9=9F=B3=E9=A2=91=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=AE=BE=E7=BD=AE=E5=86=B2=E7=AA=81=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en-us.json | 3 ++- src/lang/zh-cn.json | 3 ++- src/lang/zh-tw.json | 3 ++- src/renderer/plugins/player.js | 2 ++ .../views/setting/components/SettingPlay.vue | 17 +++++++++++++++-- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/lang/en-us.json b/src/lang/en-us.json index eaac944f..5bee17b4 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -341,7 +341,8 @@ "setting__play_mediaDevice": "Audio output", "setting__play_mediaDevice_remove_stop_play": "Pause the song when the current sound output device is changed", "setting__play_mediaDevice_title": "Select a media device for audio output", - "setting__play_media_device_tip": "This function conflicts with the audio visualization function. You have enabled audio visualization. This setting is temporarily unavailable. Please go to the playback details page to close the audio visualization and restart the software before modifying this setting.", + "setting__play_media_device_error_tip": "This function conflicts with the audio visualization function. You have enabled audio visualization when you started the software this time. This setting is temporarily unavailable. Please restart the software and then modify this setting.", + "setting__play_media_device_tip": "This feature conflicts with Audio Visualization, both cannot be enabled at the same time, would you like to turn Audio Visualization off and apply the selected audio output settings?", "setting__play_quality": "Play 320K quality songs first (if supported)", "setting__play_save_play_time": "Remember playback progress", "setting__play_task_bar": "Show playing progress on the taskbar", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index ea331d6a..a93df69b 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -341,7 +341,8 @@ "setting__play_mediaDevice": "音频输出", "setting__play_mediaDevice_remove_stop_play": "当前的声音输出设备被改变时暂停播放歌曲", "setting__play_mediaDevice_title": "选择声音输出的媒体设备", - "setting__play_media_device_tip": "此功能与音频可视化功能冲突，你已开启音频可视化，此设置暂不可用，请先去播放详情页关闭音频可视化 并 重启软件后，再来修改此设置。", + "setting__play_media_device_error_tip": "此功能与音频可视化功能冲突，你本次启动软件时已启用过音频可视化，此设置暂不可用，请 重启 软件后，再来修改此设置。", + "setting__play_media_device_tip": "此功能与音频可视化功能冲突，两者无法同时启用，是否将音频可视化关闭 并 应用所选音频输出设置？", "setting__play_quality": "优先播放320K品质的歌曲（如果支持）", "setting__play_save_play_time": "记住播放进度", "setting__play_task_bar": "在任务栏上显示当前歌曲播放进度", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index a15c4d84..eab4bd77 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -341,7 +341,8 @@ "setting__play_mediaDevice": "音頻輸出", "setting__play_mediaDevice_remove_stop_play": "當前的聲音輸出設備被改變時暫停播放歌曲", "setting__play_mediaDevice_title": "選擇聲音輸出的媒體設備", - "setting__play_media_device_tip": "此功能與音頻可視化功能衝突，你已開啟音頻可視化，此設置暫不可用，請先去播放詳情頁關閉音頻可視化 並 重啟軟件後，再來修改此設置。", + "setting__play_media_device_error_tip": "此功能與音頻可視化功能衝突，你本次啟動軟件時已啟用過音頻可視化，此設置暫不可用，請 重啟 軟件後，再來修改此設置。", + "setting__play_media_device_tip": "此功能與音頻可視化功能衝突，兩者無法同時啟用，是否將音頻可視化關閉 並 應用所選音頻輸出設置？", "setting__play_quality": "優先播放320K品質的歌曲（如果支持）", "setting__play_save_play_time": "記住播放進度", "setting__play_task_bar": "在任務欄上顯示當前歌曲播放進度", diff --git a/src/renderer/plugins/player.js b/src/renderer/plugins/player.js index 32cd3358..39451aef 100644 --- a/src/renderer/plugins/player.js +++ b/src/renderer/plugins/player.js @@ -21,6 +21,8 @@ export const getAnalyser = () => { return analyser } +export const hasInitedAnalyser = () => audioContext != null + export const setResource = src => { if (audio) audio.src = src } diff --git a/src/renderer/views/setting/components/SettingPlay.vue b/src/renderer/views/setting/components/SettingPlay.vue index 389bc051..a6f22781 100644 --- a/src/renderer/views/setting/components/SettingPlay.vue +++ b/src/renderer/views/setting/components/SettingPlay.vue @@ -24,6 +24,7 @@ dd(:tips="$t('setting__play_mediaDevice_title')")