Merge branch 'dev' into v1

2020-05-07 20:38:03 +08:00
parent ded75563e9 b76424ba9b
commit 90e40d5245
12 changed files with 95 additions and 61 deletions
@@ -617,12 +617,12 @@ export default {
    },
    async setMediaDevice() {
      let mediaDeviceId = this.setting.player.mediaDeviceId
-      if (!mediaDeviceId) return
      const devices = await navigator.mediaDevices.enumerateDevices()
      let device = devices.find(device => device.deviceId === mediaDeviceId)
-      if (!device) return this.setMediaDeviceId('default')
+      const deviceId = device ? device.deviceId : 'default'
+
      // console.log(device)
-      this.audio.setSinkId(device.deviceId).catch((err) => {
+      this.audio.setSinkId(deviceId).catch(err => {
        console.log(err)
        this.setMediaDeviceId('default')
      })