Update main/app/app.py

main/app/app.py

@@ -159,7 +159,7 @@ js_code = """
     window.getAudioDevices = async function() {
         if (!navigator.mediaDevices) {
             setStatus("__MEDIA_DEVICES__");
-            return {"inputs": [], "outputs": []};
+            return {"inputs": {}, "outputs": {}};
         }
 
         try {
@@ -168,22 +168,22 @@ js_code = """
             console.error(err);
             setStatus("__MIC_INACCESSIBLE__")
 
-            return {"inputs": [], "outputs": []};
+            return {"inputs": {}, "outputs": {}};
         }
 
         const devices = await navigator.mediaDevices.enumerateDevices();
-        const inputs = [];
-        const outputs = [];
+        const inputs = {};
+        const outputs = {};
         
         for (const device of devices) {
             if (device.kind === "audioinput") {
-                inputs.push([device.label, device.deviceId])
+                inputs[device.label] = device.deviceId
             } else if (device.kind === "audiooutput") {
-                outputs.push([device.label, device.deviceId])
+                outputs[device.label] = device.deviceId
             }
         }
 
-        if (!inputs.length && !outputs.length) return {"inputs": [], "outputs": []};
+        if (!Object.keys(inputs).length && !Object.keys(outputs).length) return {"inputs": {}, "outputs": {}};
         return {"inputs": inputs, "outputs": outputs};
     };
         
@@ -226,9 +226,13 @@ js_code = """
         const ReadChunkSize = Math.round(chunk_size * SampleRate / 1000 / 128);
         const block_frame = parseInt(ReadChunkSize) * 128;
         const ButtonState = { start_button: true, stop_button: false };
+        const devices = await window.getAudioDevices();
 
-        try {
+        input_audio_device = devices["inputs"][input_audio_device];
+        output_audio_device = devices["outputs"][output_audio_device];
+        if (use_monitor_device && devices["outputs"][monitor_output_device]) monitor_output_device = devices["outputs"][monitor_output_device];
 
+        try {
             if (!input_audio_device || !output_audio_device) {
                 setStatus("__PROVIDE_AUDIO_DEVICE__");
                 return ButtonState;
@@ -428,7 +432,7 @@ js_code = """
     "__PROVIDE_MODEL__", translations["provide_file"].format(filename=translations["model"])
 )
 
-client_mode = True # "--client" in sys.argv
+client_mode = "--client" in sys.argv
 
 with gr.Blocks(
     title="📱 Vietnamese-RVC GUI BY ANH",