messenger-gtk

commit c28fa0b89f5ef3ec027ecdc9b1966ee0bfb2c647
parent 396bb4ca3bad72a1fdfc302e677b00bbc581fa1e
Author: Jacki <jacki@thejackimonster.de>
Date:   Thu, 15 Aug 2024 14:59:54 +0200

Return to default pipewiresrc if no webcam source was found

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
M
src/media.c
 | 
2
+-
M
src/ui/discourse.c
 | 
5
+----
M
src/ui/new_contact.c
 | 
4
----

3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/media.c b/src/media.c
@@ -172,7 +172,7 @@ media_init_camera_capturing(MESSENGER_MediaInfo *media,
   int fd = -1;
 
 #ifndef MESSENGER_APPLICATION_NO_PORTAL
-  if (app->portal)
+  if ((app->portal) && (xdp_portal_is_camera_present(app->portal)))
     fd = xdp_portal_open_pipewire_remote_for_camera(app->portal);
 #endif
   
diff --git a/src/ui/discourse.c b/src/ui/discourse.c
@@ -143,10 +143,7 @@ iterate_cameras(void *cls,
     return;
 
   if (handle->video_discourse)
-  {
     discourse_set_target(handle->video_discourse, name);
-    handle->streaming = true;
-  }
 }
 
 static void
@@ -165,8 +162,8 @@ _request_camera_callback(MESSENGER_Application *app,
   media_init_camera_capturing(&(app->media.camera), app);
   media_pw_main_loop_run(&(app->media.camera));
 
-  handle->streaming = false;
   media_pw_iterate_nodes(&(app->media.camera), iterate_cameras, handle);
+  handle->streaming = true;
 
   _update_streaming_state(handle, handle->streaming);
 }
diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
@@ -365,11 +365,7 @@ _init_camera_pipeline(MESSENGER_Application *app,
 
   handle->camera_count = 0;
 
-#ifndef MESSENGER_APPLICATION_NO_PORTAL
-  if ((app->portal) && ((access) || xdp_portal_is_camera_present(app->portal)))
-#else
   if (access)
-#endif
   {
     media_init_camera_capturing(&(app->media.camera), app);
     media_pw_main_loop_run(&(app->media.camera));