diff --git a/src/components/CscMedia.vue b/src/components/CscMedia.vue
index 8374e668..7cc0eef4 100644
--- a/src/components/CscMedia.vue
+++ b/src/components/CscMedia.vue
@@ -165,8 +165,8 @@
this.fitMediaToParent();
}
},
- toggleAudio(){
- return this.$refs.media.muted = !this.$refs.media.muted;
+ toggleAudio(muted){
+ return this.$refs.media.muted = muted || !this.$refs.media.muted;
},
isMuted(){
return this.$refs.media.muted;
diff --git a/src/components/layouts/Conference.vue b/src/components/layouts/Conference.vue
index 3e58970b..a8177ed7 100644
--- a/src/components/layouts/Conference.vue
+++ b/src/components/layouts/Conference.vue
@@ -40,7 +40,9 @@
v-if="!isJoining && isJoined"
/>
@@ -113,6 +115,31 @@
@click="toggleScreen()"
:disable="!hasConferenceId || isJoining"
/>
+
+
+
+
+
+
+
+
+
@@ -48,6 +49,9 @@
CscConferenceRemoteParticipant,
CscConferenceLocalParticipant
},
+ props: [
+ 'isMuted'
+ ],
computed: {
...mapState('conference', [
'remoteMediaStreams'
diff --git a/src/components/pages/Conference/CscConferenceRemoteParticipant.vue b/src/components/pages/Conference/CscConferenceRemoteParticipant.vue
index 14dc25df..b5c7cce8 100644
--- a/src/components/pages/Conference/CscConferenceRemoteParticipant.vue
+++ b/src/components/pages/Conference/CscConferenceRemoteParticipant.vue
@@ -25,13 +25,13 @@
@@ -78,8 +78,8 @@
},
data: function () {
return {
- localMediaStream : null,
- isMuted: false
+ isAudioMuted: JSON.parse(this.isMuted),
+ localMediaStream : null
}
},
props: [
@@ -87,6 +87,7 @@
'remoteMediaStream',
'remoteMediaStreams',
'hasRemoteVideo',
+ 'isMuted'
],
computed: {
...mapState('conference', [
@@ -117,11 +118,11 @@
}
},
toggleAudio(){
- this.$refs.popover.close()
- this.isMuted = this.$refs.cscMedia.toggleAudio();
+ this.$refs.popover.close();
+ this.isAudioMuted = this.$refs.cscMedia.toggleAudio();
},
audioLabel() {
- return this.isMuted
+ return this.isAudioMuted
? this.$t('conferencing.unmuteMicrophone')
: this.$t('conferencing.muteMicrophone');
}
@@ -129,6 +130,10 @@
watch: {
remoteMediaStreams() {
this.assignStream();
+ },
+ isMuted(){
+ this.isAudioMuted = this.isMuted;
+ this.$refs.cscMedia.toggleAudio(this.isMuted);
}
}
}
diff --git a/src/locales/en.json b/src/locales/en.json
index 5d15f54e..a434858c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -598,7 +598,9 @@
"exitDialogText": "Leave current conference now!",
"leaveButtonLabel": "Leave",
"muteMicrophone": "Mute",
- "unmuteMicrophone": "Unmute"
+ "unmuteMicrophone": "Unmute",
+ "muteAll": "Mute all",
+ "unmuteAll": "Unmute all"
},
"userSettings": {
"changePassword": "Change password",