Merge pull request #406 from tphakala:audio-settings-fix

refactor: improve audio settings configuration and validation
tphakala · Jan 23, 2025 · 6177acb · 6177acb
2 parents 065c9d9 + e993182
commit 6177acb
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/views/settings/audioSettings.html b/views/settings/audioSettings.html
@@ -137,7 +137,7 @@
                 <option value="">Select an audio source</option>
                 <template x-for="device in audioDevices" :key="device.Index">
                     <option :value="device.Name" 
-                            :selected="device.Name === audioCapture.source" 
+                            :selected="device.Name.toLowerCase().includes(audioCapture.source.toLowerCase()) || device.Name === audioCapture.source" 
                             x-text="device.Name"></option>
                 </template>
             </select>
@@ -443,12 +443,23 @@
                         <span class="help-icon" @mouseenter="showTooltip = 'audioExportBitrate'" @mouseleave="showTooltip = null">ⓘ</span>
                     </label>
                     <input type="text" id="audioExportBitrate" name="realtime.audio.export.bitrate" 
-                           x-model="audioExport.bitrate.endsWith('k') ? audioExport.bitrate : audioExport.bitrate + 'k'" 
+                           x-model="audioExport.bitrate" 
                            class="input input-bordered input-sm w-full" 
                            placeholder="Bitrate (e.g. 128k)"
                            :disabled="!ffmpegAvailable || !['aac', 'opus', 'mp3'].includes(audioExport.type)"
                            :class="{'opacity-50 cursor-not-allowed': !ffmpegAvailable || !['aac', 'opus', 'mp3'].includes(audioExport.type)}"
-                           @input="if (!$event.target.value.endsWith('k')) $event.target.value += 'k'">
+                           @input="
+                               let value = $event.target.value.replace(/[^0-9k]/g, '');
+                               if (!value.endsWith('k')) {
+                                   value = value.replace('k', '') + 'k';
+                               }
+                               let numValue = parseInt(value);
+                               if (!isNaN(numValue) && numValue >= 32 && numValue <= 320) {
+                                   audioExport.bitrate = value;
+                               } else if (value === 'k') {
+                                   audioExport.bitrate = '128k';
+                               }
+                           ">
                     <div x-show="showTooltip === 'audioExportBitrate'" x-cloak class="tooltip">
                         Bitrate for compressed audio export in kbps. Only applicable for AAC, Opus, and MP3 formats when FFmpeg is available.
                     </div>