Skip to content

Commit b6ae3b8

Browse files
Merge pull request #5966 from nextcloud/bugfix/5957
Initialize the wav encoder in the entry points instead of in the audiorecorder component
2 parents 2144b60 + 1fb72c8 commit b6ae3b8

File tree

5 files changed

+27
-7
lines changed

5 files changed

+27
-7
lines changed

src/App.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ import UploadEditor from './components/UploadEditor'
6666
import SettingsDialog from './components/SettingsDialog/SettingsDialog'
6767
import ConversationSettingsDialog from './components/ConversationSettings/ConversationSettingsDialog'
6868
import '@nextcloud/dialogs/styles/toast.scss'
69+
import { register } from 'extendable-media-recorder'
70+
import { connect } from 'extendable-media-recorder-wav-encoder'
6971
7072
export default {
7173
name: 'App',
@@ -325,7 +327,7 @@ export default {
325327
}
326328
},
327329
328-
mounted() {
330+
async mounted() {
329331
// see browserCheck mixin
330332
this.checkBrowser()
331333
// Check sidebar status in previous sessions
@@ -334,6 +336,8 @@ export default {
334336
} else if (BrowserStorage.getItem('sidebarOpen') === 'true') {
335337
this.$store.dispatch('showSidebar')
336338
}
339+
340+
register(await connect())
337341
},
338342
339343
methods: {

src/FilesSidebarTabApp.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ import ChatView from './components/ChatView'
6666
import sessionIssueHandler from './mixins/sessionIssueHandler'
6767
import browserCheck from './mixins/browserCheck'
6868
import '@nextcloud/dialogs/styles/toast.scss'
69+
import { register } from 'extendable-media-recorder'
70+
import { connect } from 'extendable-media-recorder-wav-encoder'
6971
7072
export default {
7173
@@ -138,6 +140,11 @@ export default {
138140
},
139141
},
140142
143+
async mounted() {
144+
// Initialise audiorecorder encoder
145+
register(await connect())
146+
},
147+
141148
created() {
142149
// The fetchCurrentConversation event handler/callback is started and
143150
// stopped from different FilesSidebarTabApp instances, so it needs to

src/PublicShareAuthSidebar.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ import {
4747
import { signalingKill } from './utils/webrtc/index'
4848
import sessionIssueHandler from './mixins/sessionIssueHandler'
4949
import talkHashCheck from './mixins/talkHashCheck'
50+
import { register } from 'extendable-media-recorder'
51+
import { connect } from 'extendable-media-recorder-wav-encoder'
5052
5153
export default {
5254
@@ -97,6 +99,11 @@ export default {
9799
},
98100
},
99101
102+
async mounted() {
103+
// Initialise audiorecorder encoder
104+
register(await connect())
105+
},
106+
100107
beforeMount() {
101108
window.addEventListener('unload', () => {
102109
console.info('Navigating away, leaving conversation')

src/PublicShareSidebar.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ import isInCall from './mixins/isInCall'
6161
import participant from './mixins/participant'
6262
import talkHashCheck from './mixins/talkHashCheck'
6363
import '@nextcloud/dialogs/styles/toast.scss'
64+
import { register } from 'extendable-media-recorder'
65+
import { connect } from 'extendable-media-recorder-wav-encoder'
6466
6567
export default {
6668
@@ -131,6 +133,11 @@ export default {
131133
})
132134
},
133135
136+
async mounted() {
137+
// Initialise audiorecorder encoder
138+
await register(await connect())
139+
},
140+
134141
methods: {
135142
136143
async joinConversation() {

src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ import Check from 'vue-material-design-icons/Check'
7878
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
7979
import { mediaDevicesManager } from '../../../utils/webrtc/index'
8080
import { showError } from '@nextcloud/dialogs'
81-
import { MediaRecorder, register } from 'extendable-media-recorder'
82-
import { connect } from 'extendable-media-recorder-wav-encoder'
81+
import { MediaRecorder } from 'extendable-media-recorder'
8382
8483
export default {
8584
name: 'AudioRecorder',
@@ -156,10 +155,6 @@ export default {
156155
},
157156
},
158157
159-
async mounted() {
160-
await register(await connect())
161-
},
162-
163158
beforeDestroy() {
164159
this.killStreams()
165160
},

0 commit comments

Comments
 (0)