Conditionally support mixer script

Author: badaix

client/player/player.cpp

@@ -26,23 +26,15 @@
 #include "common/utils/string_utils.hpp"
 
 // 3rd party headers
+#ifdef SUPPORTS_VOLUME_SCRIPT
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#if BOOST_VERSION >= 108000
 #if defined(__clang__) && (__clang_major__ >= 13) && !((__clang_major__ == 13) && (__clang_minor__ == 0) && (__clang_patchlevel__ == 0))
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 #pragma GCC diagnostic ignored "-Wpedantic"
-#include <boost/process/v2.hpp>
-#else
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wunused-result"
-#pragma GCC diagnostic ignored "-Wmissing-braces"
-#pragma GCC diagnostic ignored "-Wnarrowing"
-#pragma GCC diagnostic ignored "-Wc++11-narrowing"
-#include <boost/process/args.hpp>
-#include <boost/process/child.hpp>
-#include <boost/process/exe.hpp>
+#include <boost/process/v2/execute.hpp>
+#include <boost/process/v2/process.hpp>
 #endif
 #pragma GCC diagnostic pop
 
@@ -244,8 +236,7 @@ void Player::setVolume(const Volume& volume)
     }
     else if (settings_.mixer.mode == ClientSettings::Mixer::Mode::script)
     {
-#if BOOST_VERSION >= 108000
-        // Use Boost process v2 if Boost >= 1.80.0 is available
+#ifdef SUPPORTS_VOLUME_SCRIPT
         static std::optional<Volume> pending_volume_setting;
         static bool script_running = false;
         if (script_running)
@@ -282,17 +273,7 @@ void Player::setVolume(const Volume& volume)
             }
         }
 #else
-        // Use Boost process v1
-        try
-        {
-            using namespace boost::process;
-            child c(exe = settings_.mixer.parameter, args = {"--volume", cpt::to_string(volume), "--mute", mute ? "true" : "false"});
-            c.detach();
-        }
-        catch (const std::exception& e)
-        {
-            LOG(ERROR, LOG_TAG) << "Failed to run script '" + settings_.mixer.parameter + "', error: " << e.what() << "\n";
-        }
+        LOG(ERROR, LOG_TAG) << "Mixer mode 'script' not supported\n";
 #endif
     }
 }

client/player/player.hpp

@@ -36,6 +36,10 @@
 #include <thread>
 #include <vector>
 
+#if (BOOST_VERSION >= 108000 && !defined(WINDOWS))
+#define SUPPORTS_VOLUME_SCRIPT
+#endif
+
 namespace player
 {
 

client/snapclient.cpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2024  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -172,10 +172,14 @@ int main(int argc, char** argv)
         hw_mixer_supported = true;
 #endif
         std::shared_ptr<popl::Value<std::string>> mixer_mode;
+
+        std::string mixers = "software";
         if (hw_mixer_supported)
-            mixer_mode = op.add<Value<string>>("", "mixer", "software|hardware|script|none|?[:<options>]", "software");
-        else
-            mixer_mode = op.add<Value<string>>("", "mixer", "software|script|none|?[:<options>]", "software");
+            mixers += "|hardware";
+#ifdef SUPPORTS_VOLUME_SCRIPT
+        mixers += "|script";
+#endif
+        mixer_mode = op.add<Value<string>>("", "mixer", mixers + "|none|?[:<options>]", "software");
 
 // daemon settings
 #ifdef HAS_DAEMON
@@ -400,16 +404,26 @@ int main(int argc, char** argv)
             settings.player.mixer.mode = ClientSettings::Mixer::Mode::software;
         else if ((mode == "hardware") && hw_mixer_supported)
             settings.player.mixer.mode = ClientSettings::Mixer::Mode::hardware;
+#ifdef SUPPORTS_VOLUME_SCRIPT
         else if (mode == "script")
             settings.player.mixer.mode = ClientSettings::Mixer::Mode::script;
+#endif
         else if (mode == "none")
             settings.player.mixer.mode = ClientSettings::Mixer::Mode::none;
         else if ((mode == "?") || (mode == "help"))
         {
-            cout << "mixer can be one of 'software', " << (hw_mixer_supported ? "'hardware', " : "") << "'script', 'none'\n"
+            cout << "mixer can be one of 'software', " << (hw_mixer_supported ? "'hardware', " : "")
+#ifdef SUPPORTS_VOLUME_SCRIPT
+                 << "'script', "
+#endif
+                 << "'none'\n"
                  << "followed by optional parameters:\n"
                  << " * software[:poly[:<exponent>]|exp[:<base>]]\n"
-                 << (hw_mixer_supported ? " * hardware[:<mixer name>]\n" : "") << " * script[:<script filename>]\n";
+                 << (hw_mixer_supported ? " * hardware[:<mixer name>]\n" : "")
+#ifdef SUPPORTS_VOLUME_SCRIPT
+                 << " * script[:<script filename>]"
+#endif
+                 << "\n";
             exit(EXIT_SUCCESS);
         }
         else