Browse Source
Merge pull request #6103 from nextcloud/fix-duplicated-registration-of-audio-encoder
Fix duplicated registration of audio encoder
pull/6054/head
Joas Schilling
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
0 additions and
25 deletions
-
src/App.vue
-
src/FilesSidebarTabApp.vue
-
src/PublicShareAuthSidebar.vue
-
src/PublicShareSidebar.vue
|
|
|
@ -66,8 +66,6 @@ import UploadEditor from './components/UploadEditor' |
|
|
|
import SettingsDialog from './components/SettingsDialog/SettingsDialog' |
|
|
|
import ConversationSettingsDialog from './components/ConversationSettings/ConversationSettingsDialog' |
|
|
|
import '@nextcloud/dialogs/styles/toast.scss' |
|
|
|
import { register } from 'extendable-media-recorder' |
|
|
|
import { connect } from 'extendable-media-recorder-wav-encoder' |
|
|
|
import { CONVERSATION } from './constants' |
|
|
|
|
|
|
|
export default { |
|
|
|
@ -363,8 +361,6 @@ export default { |
|
|
|
} else if (BrowserStorage.getItem('sidebarOpen') === 'true') { |
|
|
|
this.$store.dispatch('showSidebar') |
|
|
|
} |
|
|
|
|
|
|
|
register(await connect()) |
|
|
|
}, |
|
|
|
|
|
|
|
methods: { |
|
|
|
|
|
|
|
@ -66,8 +66,6 @@ import ChatView from './components/ChatView' |
|
|
|
import sessionIssueHandler from './mixins/sessionIssueHandler' |
|
|
|
import browserCheck from './mixins/browserCheck' |
|
|
|
import '@nextcloud/dialogs/styles/toast.scss' |
|
|
|
import { register } from 'extendable-media-recorder' |
|
|
|
import { connect } from 'extendable-media-recorder-wav-encoder' |
|
|
|
|
|
|
|
export default { |
|
|
|
|
|
|
|
@ -140,11 +138,6 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
async mounted() { |
|
|
|
// Initialise audiorecorder encoder |
|
|
|
register(await connect()) |
|
|
|
}, |
|
|
|
|
|
|
|
created() { |
|
|
|
// The fetchCurrentConversation event handler/callback is started and |
|
|
|
// stopped from different FilesSidebarTabApp instances, so it needs to |
|
|
|
|
|
|
|
@ -47,8 +47,6 @@ import { |
|
|
|
import { signalingKill } from './utils/webrtc/index' |
|
|
|
import sessionIssueHandler from './mixins/sessionIssueHandler' |
|
|
|
import talkHashCheck from './mixins/talkHashCheck' |
|
|
|
import { register } from 'extendable-media-recorder' |
|
|
|
import { connect } from 'extendable-media-recorder-wav-encoder' |
|
|
|
|
|
|
|
export default { |
|
|
|
|
|
|
|
@ -99,11 +97,6 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
async mounted() { |
|
|
|
// Initialise audiorecorder encoder |
|
|
|
register(await connect()) |
|
|
|
}, |
|
|
|
|
|
|
|
beforeMount() { |
|
|
|
window.addEventListener('unload', () => { |
|
|
|
console.info('Navigating away, leaving conversation') |
|
|
|
|
|
|
|
@ -61,8 +61,6 @@ import isInCall from './mixins/isInCall' |
|
|
|
import participant from './mixins/participant' |
|
|
|
import talkHashCheck from './mixins/talkHashCheck' |
|
|
|
import '@nextcloud/dialogs/styles/toast.scss' |
|
|
|
import { register } from 'extendable-media-recorder' |
|
|
|
import { connect } from 'extendable-media-recorder-wav-encoder' |
|
|
|
|
|
|
|
export default { |
|
|
|
|
|
|
|
@ -133,11 +131,6 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
async mounted() { |
|
|
|
// Initialise audiorecorder encoder |
|
|
|
await register(await connect()) |
|
|
|
}, |
|
|
|
|
|
|
|
methods: { |
|
|
|
|
|
|
|
async joinConversation() { |
|
|
|
|