Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve system audio as null if unavailable #54

Merged
merged 1 commit into from
Jun 2, 2023
Merged

fix: resolve system audio as null if unavailable #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/device/device-management.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,26 @@ export async function createDisplayTrack<T extends LocalTrack>(
*
* @param videoTrackConstructor - Constructor for the local display track.
* @param audioTrackConstructor - Constructor for the local system audio track.
* @param videoContentHint - An optional parameters to give a hint for the content of the track.
* @returns A Promise that resolves to a LocalDisplayTrack and a LocalSystemAudioTrack.
* @param videoContentHint - An optional parameter to give a hint for the content of the track.
* @returns A Promise that resolves to a LocalDisplayTrack and a LocalSystemAudioTrack. If no system
* audio is available, the LocalSystemAudioTrack will be resolved as null instead.
*/
export async function createDisplayTrackWithAudio<T extends LocalTrack, U extends LocalTrack>(
videoTrackConstructor: Constructor<T>,
audioTrackConstructor: Constructor<U>,
videoContentHint?: VideoContentHint
): Promise<[T, U]> {
): Promise<[T, U | null]> {
const stream = await media.getDisplayMedia({ video: true, audio: true });
// eslint-disable-next-line new-cap
const videoTrack = new videoTrackConstructor(
new MediaStream(stream.getVideoTracks()),
videoContentHint
);
// eslint-disable-next-line new-cap
const audioTrack = new audioTrackConstructor(new MediaStream(stream.getAudioTracks()));
let audioTrack = null;
if (stream.getAudioTracks().length > 0) {
// eslint-disable-next-line new-cap
audioTrack = new audioTrackConstructor(new MediaStream(stream.getAudioTracks()));
}
return [videoTrack, audioTrack];
}

Expand Down