Merge pull request #833 from vector-im/SimonBrandner/feat/hide-audio
This commit is contained in:
		
				commit
				
					
						0d151452ba
					
				
			
		
					 3 changed files with 16 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -36,6 +36,7 @@ interface Props {
 | 
			
		|||
  mediaRef?: React.RefObject<MediaElement>;
 | 
			
		||||
  onOptionsPress?: () => void;
 | 
			
		||||
  localVolume?: number;
 | 
			
		||||
  hasAudio?: boolean;
 | 
			
		||||
  maximised?: boolean;
 | 
			
		||||
  fullscreen?: boolean;
 | 
			
		||||
  onFullscreen?: () => void;
 | 
			
		||||
| 
						 | 
				
			
			@ -58,6 +59,7 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
 | 
			
		|||
      mediaRef,
 | 
			
		||||
      onOptionsPress,
 | 
			
		||||
      localVolume,
 | 
			
		||||
      hasAudio,
 | 
			
		||||
      maximised,
 | 
			
		||||
      fullscreen,
 | 
			
		||||
      onFullscreen,
 | 
			
		||||
| 
						 | 
				
			
			@ -74,14 +76,16 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
 | 
			
		|||
 | 
			
		||||
    const toolbarButtons: JSX.Element[] = [];
 | 
			
		||||
    if (connectionState == ConnectionState.Connected && !isLocal) {
 | 
			
		||||
      toolbarButtons.push(
 | 
			
		||||
        <AudioButton
 | 
			
		||||
          key="localVolume"
 | 
			
		||||
          className={styles.button}
 | 
			
		||||
          volume={localVolume}
 | 
			
		||||
          onPress={onOptionsPress}
 | 
			
		||||
        />
 | 
			
		||||
      );
 | 
			
		||||
      if (hasAudio) {
 | 
			
		||||
        toolbarButtons.push(
 | 
			
		||||
          <AudioButton
 | 
			
		||||
            key="localVolume"
 | 
			
		||||
            className={styles.button}
 | 
			
		||||
            volume={localVolume}
 | 
			
		||||
            onPress={onOptionsPress}
 | 
			
		||||
          />
 | 
			
		||||
        );
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if (screenshare) {
 | 
			
		||||
        toolbarButtons.push(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -62,6 +62,7 @@ export function VideoTileContainer({
 | 
			
		|||
    audioMuted,
 | 
			
		||||
    videoMuted,
 | 
			
		||||
    localVolume,
 | 
			
		||||
    hasAudio,
 | 
			
		||||
    speaking,
 | 
			
		||||
    stream,
 | 
			
		||||
    purpose,
 | 
			
		||||
| 
						 | 
				
			
			@ -109,6 +110,7 @@ export function VideoTileContainer({
 | 
			
		|||
        avatar={getAvatar && getAvatar(item.member, width, height)}
 | 
			
		||||
        onOptionsPress={onOptionsPress}
 | 
			
		||||
        localVolume={localVolume}
 | 
			
		||||
        hasAudio={hasAudio}
 | 
			
		||||
        maximised={maximised}
 | 
			
		||||
        fullscreen={fullscreen}
 | 
			
		||||
        onFullscreen={onFullscreenCallback}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,6 +25,7 @@ interface CallFeedState {
 | 
			
		|||
  videoMuted: boolean;
 | 
			
		||||
  audioMuted: boolean;
 | 
			
		||||
  localVolume: number;
 | 
			
		||||
  hasAudio: boolean;
 | 
			
		||||
  disposed: boolean | undefined;
 | 
			
		||||
  stream: MediaStream | undefined;
 | 
			
		||||
  purpose: SDPStreamMetadataPurpose | undefined;
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +39,7 @@ function getCallFeedState(callFeed: CallFeed | undefined): CallFeedState {
 | 
			
		|||
    videoMuted: callFeed ? callFeed.isVideoMuted() : true,
 | 
			
		||||
    audioMuted: callFeed ? callFeed.isAudioMuted() : true,
 | 
			
		||||
    localVolume: callFeed ? callFeed.getLocalVolume() : 0,
 | 
			
		||||
    hasAudio: callFeed ? callFeed.stream.getAudioTracks().length >= 1 : false,
 | 
			
		||||
    disposed: callFeed ? callFeed.disposed : undefined,
 | 
			
		||||
    stream: callFeed ? callFeed.stream : undefined,
 | 
			
		||||
    purpose: callFeed ? callFeed.purpose : undefined,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue