detachをコンポーネントのみにした

traPtitech · Jan 22, 2025 · dd5333f · dd5333f
1 parent 1c2f3dd
commit dd5333f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/components/Main/MainView/QallView/AudioTrack.vue b/src/components/Main/MainView/QallView/AudioTrack.vue
@@ -21,7 +21,9 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  trackInfo.trackPublication?.track?.detach()
+  if (audioElement.value) {
+    trackInfo.trackPublication?.track?.detach(audioElement.value)
+  }
 })
 </script>
 

diff --git a/src/components/Main/MainView/QallView/QallView.vue b/src/components/Main/MainView/QallView/QallView.vue
@@ -8,7 +8,6 @@ import CallControlButton from './CallControlButton.vue'
 import CallControlButtonSmall from './CallControlButtonSmall.vue'
 import ScreenShareComponent from './ScreenShareComponent.vue'
 import { LocalTrackPublication } from 'livekit-client'
-import VideoTrack from '/@/components/Main/MainView/QallView/VideoTrack.vue'
 
 const {
   tracksMap,
@@ -196,7 +195,6 @@ const backgroundType = ref<'original' | 'blur' | 'file' | 'screen'>('original')
         <VideoComponent
           v-if="
             track.trackPublication?.kind === 'video' &&
-            !(track.trackPublication.track instanceof VideoTrack) &&
             !screenShareTrackSidMap.has(sid)
           "
           :track-info="track"

diff --git a/src/components/Main/MainView/QallView/ScreenShareComponent.vue b/src/components/Main/MainView/QallView/ScreenShareComponent.vue
@@ -28,8 +28,10 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  trackInfo.trackPublication?.track?.detach()
-  audioTrackInfo?.trackPublication?.track?.detach()
+  if (videoElement.value && audioElement.value) {
+    trackInfo.trackPublication?.track?.detach(videoElement.value)
+    audioTrackInfo?.trackPublication?.track?.detach(audioElement.value)
+  }
 })
 </script>
 

diff --git a/src/components/Main/MainView/QallView/VideoTrack.vue b/src/components/Main/MainView/QallView/VideoTrack.vue
@@ -24,7 +24,9 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  trackInfo.trackPublication?.track?.detach()
+  if (videoElement.value) {
+    trackInfo.trackPublication?.track?.detach(videoElement.value)
+  }
 })
 </script>