This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prevent Element appearing in system media controls (#10995)
* Use WebAudio API to play notification sound So that it won't appear in system media control. * Run prettier * Chosse from mp3 and ogg * Run prettier * Use WebAudioAPI everywhere There's still one remoteAudio. I'm not sure what it does. It seems it's only used in tests... * Run prettier * Eliminate a stupid error * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update setupManualMocks.ts * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * mocks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * mocks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Simplify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * covg Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
- Loading branch information
3 people
authored
Jul 4, 2024
1 parent
c61eca8
commit e288f61
Showing
12 changed files
with
255 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| Copyright 2024 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import { logger } from "matrix-js-sdk/src/logger"; | ||
|
|
||
| import { createAudioContext } from "./compat"; | ||
|
|
||
| const formatMap = { | ||
| mp3: "audio/mpeg", | ||
| ogg: "audio/ogg", | ||
| }; | ||
|
|
||
| export class BackgroundAudio { | ||
| private audioContext = createAudioContext(); | ||
| private sounds: Record<string, AudioBuffer> = {}; | ||
|
|
||
| public async pickFormatAndPlay<F extends Array<keyof typeof formatMap>>( | ||
| urlPrefix: string, | ||
| formats: F, | ||
| loop = false, | ||
| ): Promise<AudioBufferSourceNode> { | ||
| const format = this.pickFormat(...formats); | ||
| if (!format) { | ||
| console.log("Browser doesn't support any of the formats", formats); | ||
| // Will probably never happen. If happened, format="" and will fail to load audio. Who cares... | ||
| } | ||
|
|
||
| return this.play(`${urlPrefix}.${format}`, loop); | ||
| } | ||
|
|
||
| public async play(url: string, loop = false): Promise<AudioBufferSourceNode> { | ||
| if (!this.sounds.hasOwnProperty(url)) { | ||
| // No cache, fetch it | ||
| const response = await fetch(url); | ||
| if (response.status != 200) { | ||
| logger.warn("Failed to fetch error audio"); | ||
| } | ||
| const buffer = await response.arrayBuffer(); | ||
| const sound = await this.audioContext.decodeAudioData(buffer); | ||
| this.sounds[url] = sound; | ||
| } | ||
| const source = this.audioContext.createBufferSource(); | ||
| source.buffer = this.sounds[url]; | ||
| source.loop = loop; | ||
| source.connect(this.audioContext.destination); | ||
| source.start(); | ||
| return source; | ||
| } | ||
|
|
||
| private pickFormat<F extends Array<keyof typeof formatMap>>(...formats: F): F[number] | null { | ||
| // Detect supported formats | ||
| const audioElement = document.createElement("audio"); | ||
|
|
||
| for (const format of formats) { | ||
| if (audioElement.canPlayType(formatMap[format])) { | ||
| return format; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.