diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-04-12 10:39:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 10:39:57 +0900 |
| commit | 0db88a5a3b1ee413886edfb78940de4d2ed1b815 (patch) | |
| tree | 92b336604b8f3293e84d4ae66dfceb29fec56d2b /packages/frontend/src/scripts | |
| parent | update CHANGELOG.md (diff) | |
| download | sharkey-0db88a5a3b1ee413886edfb78940de4d2ed1b815.tar.gz sharkey-0db88a5a3b1ee413886edfb78940de4d2ed1b815.tar.bz2 sharkey-0db88a5a3b1ee413886edfb78940de4d2ed1b815.zip | |
refactor: サウンド関連の設定をpizzaxに移行 (#8105)
* enhane: unison-reloadに指定したパスに移動できるように
* null
* null
* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
* null
* await?
* rename
* rename
* Update read.ts
* merge
* get-note-summary
* fix
* swパッケージに
* add missing packages
* fix getNoteSummary
* add webpack-cli
* :v:
* remove plugins
* sw-inject分離したがテストしてない
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix
* :v:
* clean up config
* typesを戻した
* backend/src/web/index.ts
* notification-badges
* add scripts
* change create-notification.ts
* Update packages/client/src/components/notification.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* disconnect
* oops
* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた
* truncate notification
* Update packages/client/src/ui/_common_/common.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* clean up
* clean up
* refactor
* キャッシュ対策
* Truncate push notification message
* fix
* wip
* clean up
* migration
* migration
* comment
* move soundConfigStore
* :v:
* clean up
* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
* components/drive-file-thumbnail.vue
* components/drive-select-dialog.vue
* components/drive-window.vue
* merge
* fix
* remove reversi setting
* Service Workerのビルドにesbuildを使うようにする
* return createEmptyNotification()
* fix
* fix
* i18n.ts
* update
* :v:
* remove ts-loader
* fix
* fix
* enhance: Service Workerを常に登録するように
* pollEnded
* pollEnded
* URLをsw.jsに戻す
* clean up
* clean up
* update sounds.vue
* update
* fix type
* :v:
* ;v;
---------
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/sound.ts | 61 |
1 files changed, 57 insertions, 4 deletions
diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts index 35fd007e64..7a5dd4dbfa 100644 --- a/packages/frontend/src/scripts/sound.ts +++ b/packages/frontend/src/scripts/sound.ts @@ -1,4 +1,56 @@ -import { ColdDeviceStorage } from '@/store'; +import { markRaw } from 'vue'; +import { Storage } from '@/pizzax'; + +export const soundConfigStore = markRaw(new Storage('sound', { + mediaVolume: { + where: 'device', + default: 0.5 + }, + sound_masterVolume: { + where: 'device', + default: 0.3 + }, + sound_note: { + where: 'account', + default: { type: 'syuilo/n-aec', volume: 1 } + }, + sound_noteMy: { + where: 'account', + default: { type: 'syuilo/n-cea-4va', volume: 1 } + }, + sound_notification: { + where: 'account', + default: { type: 'syuilo/n-ea', volume: 1 } + }, + sound_chat: { + where: 'account', + default: { type: 'syuilo/pope1', volume: 1 } + }, + sound_chatBg: { + where: 'account', + default: { type: 'syuilo/waon', volume: 1 } + }, + sound_antenna: { + where: 'account', + default: { type: 'syuilo/triple', volume: 1 } + }, + sound_channel: { + where: 'account', + default: { type: 'syuilo/square-pico', volume: 1 } + }, +})); + +await soundConfigStore.ready; + +//#region サウンドのColdDeviceStorage => indexedDBのマイグレーション +for (const target of Object.keys(soundConfigStore.state) as Array<keyof typeof soundConfigStore.state>) { + const value = localStorage.getItem(`miux:${target}`); + if (value) { + soundConfigStore.set(target, JSON.parse(value) as typeof soundConfigStore.def[typeof target]['default']); + localStorage.removeItem(`miux:${target}`); + } +} +//#endregion const cache = new Map<string, HTMLAudioElement>(); @@ -67,19 +119,20 @@ export function getAudio(file: string, useCache = true): HTMLAudioElement { } export function setVolume(audio: HTMLAudioElement, volume: number): HTMLAudioElement { - const masterVolume = ColdDeviceStorage.get('sound_masterVolume'); + const masterVolume = soundConfigStore.state.sound_masterVolume; audio.volume = masterVolume - ((1 - volume) * masterVolume); return audio; } export function play(type: 'noteMy' | 'note' | 'antenna' | 'channel' | 'notification') { - const sound = ColdDeviceStorage.get(`sound_${type}`); + const sound = soundConfigStore.state[`sound_${type}`]; + if (_DEV_) console.log('play', type, sound); if (sound.type == null) return; playFile(sound.type, sound.volume); } export function playFile(file: string, volume: number) { - const masterVolume = ColdDeviceStorage.get('sound_masterVolume'); + const masterVolume = soundConfigStore.state.sound_masterVolume; if (masterVolume === 0) return; const audio = setVolume(getAudio(file), volume); |