diff --git a/src/assets/sounds/LICENSE.md b/src/assets/sounds/LICENSE.md index 42d569b40..0d4a360eb 100644 --- a/src/assets/sounds/LICENSE.md +++ b/src/assets/sounds/LICENSE.md @@ -1,6 +1,6 @@ # Sound licenses - `chat.mp3` -- `chat.oga` +- `chat.ogg` © [notificationsounds.com](https://notificationsounds.com/notification-sounds/intuition-561), licensed under [CC BY 4.0](https://creativecommons.org/licenses/by-sa/4.0/). diff --git a/src/assets/sounds/boop.mp3 b/src/assets/sounds/boop.mp3 index bf9c3c1aa..b8f761082 100644 Binary files a/src/assets/sounds/boop.mp3 and b/src/assets/sounds/boop.mp3 differ diff --git a/src/assets/sounds/boop.ogg b/src/assets/sounds/boop.ogg index a6551c9fd..936d57042 100644 Binary files a/src/assets/sounds/boop.ogg and b/src/assets/sounds/boop.ogg differ diff --git a/src/assets/sounds/chat.oga b/src/assets/sounds/chat.ogg similarity index 100% rename from src/assets/sounds/chat.oga rename to src/assets/sounds/chat.ogg diff --git a/src/utils/sounds.ts b/src/utils/sounds.ts index fddba87c7..6774862d6 100644 --- a/src/utils/sounds.ts +++ b/src/utils/sounds.ts @@ -1,10 +1,15 @@ +import boopMp3 from 'soapbox/assets/sounds/boop.mp3'; +import boopOgg from 'soapbox/assets/sounds/boop.ogg'; +import chatMp3 from 'soapbox/assets/sounds/chat.mp3'; +import chatOgg from 'soapbox/assets/sounds/chat.ogg'; + /** Soapbox audio clip. */ -type Sound = { +interface Sound { src: string; type: string; } -export type Sounds = 'boop' | 'chat' +type Sounds = 'boop' | 'chat'; /** Produce HTML5 audio from sound data. */ const createAudio = (sources: Sound[]): HTMLAudioElement => { @@ -42,25 +47,13 @@ const play = (audio: HTMLAudioElement): Promise => { const soundCache: Record = { boop: createAudio([ - { - src: require('../assets/sounds/boop.ogg'), - type: 'audio/ogg', - }, - { - src: require('../assets/sounds/boop.mp3'), - type: 'audio/mpeg', - }, + { src: boopOgg, type: 'audio/ogg' }, + { src: boopMp3, type: 'audio/mpeg' }, ]), chat: createAudio([ - { - src: require('../assets/sounds/chat.oga'), - type: 'audio/ogg', - }, - { - src: require('../assets/sounds/chat.mp3'), - type: 'audio/mpeg', - }, + { src: chatOgg, type: 'audio/ogg' }, + { src: chatMp3, type: 'audio/mpeg' }, ]), }; -export { soundCache, play }; +export { soundCache, play, type Sounds };