ref(tracks) Remove gUM option that is no longer supported

jitsi · Dec 17, 2024 · c9add0a · c9add0a
1 parent aabc50d
commit c9add0a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/conference.js b/conference.js
@@ -442,8 +442,7 @@ export default {
         const timeout = browser.isElectron() ? 15000 : 60000;
         const audioOptions = {
             devices: [ MEDIA_TYPE.AUDIO ],
-            timeout,
-            firePermissionPromptIsShownEvent: true
+            timeout
         };
 
         // Spot uses the _desktopSharingSourceDevice config option to use an external video input device label as
@@ -478,8 +477,7 @@ export default {
         } else if (requestedAudio || requestedVideo) {
             tryCreateLocalTracks = APP.store.dispatch(createInitialAVTracks({
                 devices: initialDevices,
-                timeout,
-                firePermissionPromptIsShownEvent: true
+                timeout
             }, recordTimeMetrics)).then(({ tracks, errors: pErrors }) => {
                 Object.assign(errors, pErrors);
 

diff --git a/react/features/base/tracks/actions.web.ts b/react/features/base/tracks/actions.web.ts
@@ -359,8 +359,7 @@ export function createInitialAVTracks(options: ICreateInitialTracksOptions, reco
     return (dispatch: IStore['dispatch'], _getState: IStore['getState']) => {
         const {
             devices,
-            timeout,
-            firePermissionPromptIsShownEvent
+            timeout
         } = options;
 
         dispatch(gumPending(devices, IGUMPendingState.PENDING_UNMUTE));
@@ -400,16 +399,14 @@ export function createInitialAVTracks(options: ICreateInitialTracksOptions, reco
             if (devices.includes(MEDIA_TYPE.AUDIO)) {
                 gUMPromises.push(createLocalTracksF({
                     devices: [ MEDIA_TYPE.AUDIO ],
-                    timeout,
-                    firePermissionPromptIsShownEvent
+                    timeout
                 }));
             }
 
             if (devices.includes(MEDIA_TYPE.VIDEO)) {
                 gUMPromises.push(createLocalTracksF({
                     devices: [ MEDIA_TYPE.VIDEO ],
-                    timeout,
-                    firePermissionPromptIsShownEvent
+                    timeout
                 }));
             }
 

diff --git a/react/features/base/tracks/functions.native.ts b/react/features/base/tracks/functions.native.ts
@@ -18,9 +18,6 @@ export * from './functions.any';
  * @param {string|null} [options.micDeviceId] - Microphone device id or
  * {@code undefined} to use app's settings.
  * @param {number|undefined} [oprions.timeout] - A timeout for JitsiMeetJS.createLocalTracks used to create the tracks.
- * @param {boolean} [options.firePermissionPromptIsShownEvent] - Whether lib-jitsi-meet
- * should check for a {@code getUserMedia} permission prompt and fire a
- * corresponding event.
  * @param {IStore} store - The redux store in the context of which the function
  * is to execute and from which state such as {@code config} is to be retrieved.
  * @returns {Promise<JitsiLocalTrack[]>}

diff --git a/react/features/base/tracks/functions.web.ts b/react/features/base/tracks/functions.web.ts
@@ -32,9 +32,6 @@ export * from './functions.any';
  * @param {string|null} [options.micDeviceId] - Microphone device id or
  * {@code undefined} to use app's settings.
  * @param {number|undefined} [oprions.timeout] - A timeout for JitsiMeetJS.createLocalTracks used to create the tracks.
- * @param {boolean} [options.firePermissionPromptIsShownEvent] - Whether lib-jitsi-meet
- * should check for a {@code getUserMedia} permission prompt and fire a
- * corresponding event.
  * @param {IStore} store - The redux store in the context of which the function
  * is to execute and from which state such as {@code config} is to be retrieved.
  * @param {boolean} recordTimeMetrics - If true time metrics will be recorded.
@@ -45,7 +42,6 @@ export function createLocalTracksF(options: ITrackOptions = {}, store?: IStore,
     const {
         desktopSharingSourceDevice,
         desktopSharingSources,
-        firePermissionPromptIsShownEvent,
         timeout
     } = options;
 
@@ -91,7 +87,6 @@ export function createLocalTracksF(options: ITrackOptions = {}, store?: IStore,
                     effects,
                     facingMode: options.facingMode || getCameraFacingMode(state),
                     firefox_fake_device, // eslint-disable-line camelcase
-                    firePermissionPromptIsShownEvent,
                     micDeviceId,
                     resolution,
                     timeout
@@ -146,7 +141,6 @@ export function createPrejoinTracks() {
     if (requestedAudio || requestedVideo) {
         tryCreateLocalTracks = createLocalTracksF({
             devices: initialDevices,
-            firePermissionPromptIsShownEvent: true,
             timeout
         }, APP.store)
         .catch(async (err: Error) => {
@@ -163,15 +157,13 @@ export function createPrejoinTracks() {
             if (requestedAudio) {
                 gUMPromises.push(createLocalTracksF({
                     devices: [ MEDIA_TYPE.AUDIO ],
-                    firePermissionPromptIsShownEvent: true,
                     timeout
                 }));
             }
 
             if (requestedVideo) {
                 gUMPromises.push(createLocalTracksF({
                     devices: [ MEDIA_TYPE.VIDEO ],
-                    firePermissionPromptIsShownEvent: true,
                     timeout
                 }));
             }

diff --git a/react/features/base/tracks/types.ts b/react/features/base/tracks/types.ts
@@ -15,7 +15,6 @@ export interface ITrackOptions {
     desktopSharingSources?: string[];
     devices?: string[];
     facingMode?: string;
-    firePermissionPromptIsShownEvent?: boolean;
     micDeviceId?: string | null;
     timeout?: number;
 }
@@ -76,7 +75,6 @@ export interface IShareOptions {
 
 export interface ICreateInitialTracksOptions {
     devices: Array<MediaType>;
-    firePermissionPromptIsShownEvent?: boolean;
     timeout?: number;
 }