Merge pull request loki-47-6F-64#372 from Logical-sh/no-sink-path-reb…

…ased [Linux Pulse/Pipewire] No sink path *rebased*
psyke83 · Oct 11, 2022 · f51a84c · f51a84c
2 parents 4352541 + 907798f
commit f51a84c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/src/audio.cpp b/src/audio.cpp
@@ -162,8 +162,14 @@ void capture(safe::mail_t mail, config_t config, void *channel_data) {
   if(!ref->sink_flag->exchange(true, std::memory_order_acquire)) {
     ref->restore_sink = !config.flags[config_t::HOST_AUDIO];
 
+    // If the sink is empty (Host has no sink!), definately switch to the virtual.
+    if(ref->sink.host.empty()) {
+      if(control->set_sink(*sink)) {
+        return;
+      }
+    }
     // If the client requests audio on the host, don't change the default sink
-    if(!config.flags[config_t::HOST_AUDIO] && control->set_sink(*sink)) {
+    else if(!config.flags[config_t::HOST_AUDIO] && control->set_sink(*sink)) {
       return;
     }
   }

diff --git a/src/platform/linux/audio.cpp b/src/platform/linux/audio.cpp
@@ -343,12 +343,7 @@ class server_t : public audio_control_t {
     }
 
     auto sink_name = get_default_sink_name();
-    if(sink_name.empty()) {
-      BOOST_LOG(warning) << "Couldn't find an active sink"sv;
-    }
-    else {
-      sink.host = sink_name;
-    }
+    sink.host      = sink_name;
 
     if(index.stereo == PA_INVALID_INDEX) {
       index.stereo = load_null(stereo, speaker::map_stereo, sizeof(speaker::map_stereo));
@@ -380,6 +375,10 @@ class server_t : public audio_control_t {
       }
     }
 
+    if(sink_name.empty()) {
+      BOOST_LOG(warning) << "Couldn't find an active default sink. Continuing with virtual audio only."sv;
+    }
+
     if(nullcount == 3) {
       sink.null = std::make_optional(sink_t::null_t { stereo, surround51, surround71 });
     }
@@ -388,16 +387,18 @@ class server_t : public audio_control_t {
   }
 
   std::string get_default_sink_name() {
-    std::string sink_name = "@DEFAULT_SINK@"s;
-    auto alarm            = safe::make_alarm<int>();
+    std::string sink_name;
+    auto alarm = safe::make_alarm<int>();
 
     cb_simple_t<pa_server_info *> server_f = [&](ctx_t::pointer ctx, const pa_server_info *server_info) {
       if(!server_info) {
         BOOST_LOG(error) << "Couldn't get pulseaudio server info: "sv << pa_strerror(pa_context_errno(ctx));
         alarm->ring(-1);
       }
 
-      sink_name = server_info->default_sink_name;
+      if(server_info->default_sink_name) {
+        sink_name = server_info->default_sink_name;
+      }
       alarm->ring(0);
     };
 
@@ -408,8 +409,12 @@ class server_t : public audio_control_t {
   }
 
   std::string get_monitor_name(const std::string &sink_name) {
-    std::string monitor_name = "@DEFAULT_MONITOR@"s;
-    auto alarm               = safe::make_alarm<int>();
+    std::string monitor_name;
+    auto alarm = safe::make_alarm<int>();
+
+    if(sink_name.empty()) {
+      return monitor_name;
+    }
 
     cb_t<pa_sink_info *> sink_f = [&](ctx_t::pointer ctx, const pa_sink_info *sink_info, int eol) {
       if(!sink_info) {