From 43ea088f646a8b3a5c41699f48cf5f0b4e7d4107 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 8 Feb 2022 21:57:48 +0100
Subject: Calls: Device picker

---
 main/src/ui/call_window/call_window_controller.vala | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'main/src/ui/call_window/call_window_controller.vala')

diff --git a/main/src/ui/call_window/call_window_controller.vala b/main/src/ui/call_window/call_window_controller.vala
index 94d6e890..e482e3aa 100644
--- a/main/src/ui/call_window/call_window_controller.vala
+++ b/main/src/ui/call_window/call_window_controller.vala
@@ -271,12 +271,9 @@ public class Dino.Ui.CallWindowController : Object {
     private void update_audio_device_choices() {
         if (call_plugin.get_devices("audio", true).size == 0 || call_plugin.get_devices("audio", false).size == 0) {
             call_window.bottom_bar.show_audio_device_error();
-        } /*else if (call_plugin.get_devices("audio", true).size == 1 && call_plugin.get_devices("audio", false).size == 1) {
+        } else if (call_plugin.get_devices("audio", true).size == 1 && call_plugin.get_devices("audio", false).size == 1) {
             call_window.bottom_bar.show_audio_device_choices(false);
             return;
-        }*/ else {
-            call_window.bottom_bar.show_video_device_choices(false);
-            return;
         }
 
         AudioSettingsPopover? audio_settings_popover = call_window.bottom_bar.show_audio_device_choices(true);
@@ -290,11 +287,6 @@ public class Dino.Ui.CallWindowController : Object {
             call_state.set_audio_device(device);
             update_current_audio_device(audio_settings_popover);
         });
-//        calls.stream_created.connect((call, media) => {
-//            if (media == "audio") {
-//                update_current_audio_device(audio_settings_popover);
-//            }
-//        });
     }
 
     private void update_current_audio_device(AudioSettingsPopover audio_settings_popover) {
@@ -307,10 +299,7 @@ public class Dino.Ui.CallWindowController : Object {
 
         if (device_count == 0) {
             call_window.bottom_bar.show_video_device_error();
-        } /*else if (device_count == 1 || call_state.get_video_device() == null) {
-            call_window.bottom_bar.show_video_device_choices(false);
-            return;
-        }*/ else {
+        } else if (device_count == 1 || call_state.get_video_device() == null) {
             call_window.bottom_bar.show_video_device_choices(false);
             return;
         }
@@ -323,11 +312,6 @@ public class Dino.Ui.CallWindowController : Object {
             update_current_video_device(video_settings_popover);
             own_video.display_device(device);
         });
-//        call_state.stream_created.connect((call, media) => {
-//            if (media == "video") {
-//                update_current_video_device(video_settings_popover);
-//            }
-//        });
     }
 
     private void update_current_video_device(VideoSettingsPopover video_settings_popover) {
-- 
cgit v1.2.3-54-g00ecf