Merge pull request #164 from alexkn/fix-device-preselection

fix microphone/sound device preselection
synesthesiam · Jan 20, 2020 · 9d1303e · 9d1303e
2 parents a12e537 + f5e6666
commit 9d1303e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/components/profile/AudioPlaying.vue b/src/components/profile/AudioPlaying.vue
@@ -108,7 +108,6 @@
      },
      data: function () {
          return {
-             device: '',
              speakers: {}
          }
      },
@@ -124,20 +123,21 @@
      },
 
      computed: {
-         devicePath: function() {
-             return 'sounds.' + this.profile.sounds.system + '.device'
+         device: {
+            get: function() {
+                if(this.profile.sounds[this.profile.sounds.system]) {
+                    return this.profile.sounds[this.profile.sounds.system].device;
+                }
+                return "";
+            },
+            set: function(newValue) {
+                this.profile.sounds[this.profile.sounds.system].device = newValue;
+            }
          }
      },
 
      mounted: function() {
-         this.getSpeakers()
-         this.device = this._.get(this.profile, this.devicePath, '')
-     },
-
-     watch: {
-         device: function() {
-             this._.set(this.profile, this.devicePath, this.device)
-         }
+         this.getSpeakers();
      }
  }
 </script>

diff --git a/src/components/profile/AudioRecording.vue b/src/components/profile/AudioRecording.vue
@@ -173,7 +173,6 @@
      },
      data: function () {
          return {
-             device: '',
              microphones: {},
              testing: false
          }
@@ -217,20 +216,21 @@
      },
 
      computed: {
-         devicePath: function() {
-             return 'microphone.' + this.profile.microphone.system + '.device'
+         device: {
+            get: function() {
+                if(this.profile.microphone[this.profile.microphone.system]) {
+                    return this.profile.microphone[this.profile.microphone.system].device;
+                }
+                return "";
+            },
+            set: function(newValue) {
+                this.profile.microphone[this.profile.microphone.system].device = newValue;
+            }
          }
      },
 
      mounted: function() {
-         this.getMicrophones()
-         this.device = this._.get(this.profile, this.devicePath, '')
-     },
-
-     watch: {
-         device: function() {
-             this._.set(this.profile, this.devicePath, this.device)
-         }
+         this.getMicrophones();
      }
  }
 </script>