Add a UI for setting audio input and output devices (#492)

Author: aroffringa

gui/renderengine.cpp

@@ -194,8 +194,7 @@ void DrawFixtureBeam(const DrawData &data, const theatre::Fixture &fixture) {
       const double sin_1 = std::sin(direction_1);
       const double cos_2 = std::cos(direction_2);
       const double sin_2 = std::sin(direction_2);
-      data.cairo->arc_negative(x, y, beam_start_radius, direction_2,
-                               direction_1);
+      data.cairo->arc(x, y, beam_start_radius, direction_2, direction_1);
       data.cairo->line_to(x + cos_1 * beam_end_radius,
                           y + sin_1 * beam_end_radius);
       // small optimization: don't draw an extra arc when the
@@ -334,8 +333,8 @@ void RenderEngine::DrawSelectedFixtures(
     const Cairo::RefPtr<Cairo::Context> &cairo,
     const std::vector<system::ObservingPtr<theatre::Fixture>>
         &selected_fixtures) const {
-  cairo->set_source_rgb(0.2, 0.2, 1.0);
   cairo->set_line_width(4.0 / scale_);
+  cairo->set_source_rgb(0.2, 0.2, 1.0);
   for (const system::ObservingPtr<theatre::Fixture> &fixture_ptr :
        selected_fixtures) {
     const theatre::Fixture *f = fixture_ptr.Get();
@@ -348,11 +347,17 @@ void RenderEngine::DrawSelectedFixtures(
       cairo->arc(x, y, radius, 0.0, 2.0 * M_PI);
       const double cos_dir = std::cos(direction);
       const double sin_dir = std::sin(direction);
-      cairo->move_to(x + radius * kRotationHandleEnd * cos_dir,
-                     y + radius * kRotationHandleEnd * sin_dir);
+      const double end_x = x + radius * kRotationHandleEnd * cos_dir;
+      const double end_y = y + radius * kRotationHandleEnd * sin_dir;
+      cairo->move_to(end_x, end_y);
       cairo->line_to(x + radius * kRotationHandleStart * cos_dir,
                      y + radius * kRotationHandleStart * sin_dir);
       cairo->stroke();
+      cairo->arc(end_x, end_y, 5.0 / scale_, 0.0, 2.0 * M_PI);
+      cairo->set_source_rgb(0.2, 0.5, 1.0);
+      cairo->fill_preserve();
+      cairo->set_source_rgb(0.2, 0.2, 1.0);
+      cairo->stroke();
     }
   }
 }

gui/windows/settingswindow.cpp

@@ -1,9 +1,14 @@
 #include "settingswindow.h"
 
+#include <cassert>
 #include <variant>
 
+#include <alsa/asoundlib.h>
+
 #include "gui/instance.h"
 
+#include "system/settings.h"
+
 #include "theatre/management.h"
 
 namespace glight::gui::windows {
@@ -15,6 +20,20 @@ using theatre::devices::OutputMapping;
 using theatre::devices::UniverseMap;
 
 SettingsWindow::SettingsWindow() {
+  MakeDmxPage();
+
+  // notebook_.append_page(midi_page_, "MIDI");
+
+  MakeAudioPage();
+
+  add(notebook_);
+  notebook_.show_all();
+
+  FillUniverses();
+  UpdateAfterSelection();
+}
+
+void SettingsWindow::MakeDmxPage() {
   universe_list_store_ = Gtk::ListStore::create(universe_columns_);
   universe_list_view_.set_model(universe_list_store_);
   universe_list_view_.append_column("Universe", universe_columns_.universe_);
@@ -66,14 +85,62 @@ SettingsWindow::SettingsWindow() {
   dmx_output_rb_.signal_clicked().connect(save_universe);
   dmx_page_.attach(dmx_output_rb_, 0, 6, 2, 1);
   notebook_.append_page(dmx_page_, "DMX");
+}
 
-  notebook_.append_page(midi_page_, "MIDI");
-
-  add(notebook_);
-  notebook_.show_all();
-
-  FillUniverses();
-  UpdateAfterSelection();
+void SettingsWindow::MakeAudioPage() {
+  void** hints = nullptr;
+  if (snd_device_name_hint(-1, "pcm", &hints) >= 0) {
+    size_t hi = 0;
+    output_devices_combo_.remove_all();
+    const std::string selected_input = Instance::Settings().audio_input;
+    const std::string selected_output = Instance::Settings().audio_output;
+    while (hints[hi] != nullptr) {
+      char* device_name = snd_device_name_get_hint(hints[hi], "NAME");
+      char* device_desc = snd_device_name_get_hint(hints[hi], "DESC");
+      char* input_or_output = snd_device_name_get_hint(hints[hi], "IOID");
+      const bool is_input = input_or_output == nullptr ||
+                            std::strcmp(input_or_output, "Input") == 0;
+      const bool is_output = input_or_output == nullptr ||
+                             std::strcmp(input_or_output, "Output") == 0;
+      assert(is_input || is_output);
+      std::string device_desc_str(device_desc);
+      const std::size_t new_line = device_desc_str.find('\n');
+      if (new_line != std::string::npos) {
+        device_desc_str.resize(new_line);
+      }
+      const std::string description_with_name =
+          device_desc_str + " (" + device_name + ")";
+      if (is_input) {
+        input_devices_combo_.append(description_with_name);
+        input_devices_.emplace_back(device_name);
+      }
+      if (is_output) {
+        output_devices_combo_.append(description_with_name);
+        output_devices_.emplace_back(device_name);
+      }
+      if (selected_input == device_name) input_devices_combo_.set_active(hi);
+      if (selected_output == device_name) output_devices_combo_.set_active(hi);
+      free(input_or_output);
+      free(device_desc);
+      free(device_name);
+      ++hi;
+    }
+    snd_device_name_free_hint(hints);
+  }
+  input_devices_combo_.signal_changed().connect([&]() { SetInputAudio(); });
+  output_devices_combo_.signal_changed().connect([&]() { SetOutputAudio(); });
+  audio_page_label_.set_line_wrap(true);
+  audio_page_label_.set_max_width_chars(40);
+  audio_page_label_.set_margin_start(8);
+  audio_page_label_.set_margin_end(8);
+  audio_page_label_.set_margin_top(8);
+  audio_page_label_.set_margin_bottom(8);
+  audio_page_.attach(audio_page_label_, 0, 0, 2, 1);
+  audio_page_.attach(input_devices_label_, 0, 1);
+  audio_page_.attach(input_devices_combo_, 1, 1);
+  audio_page_.attach(output_devices_label_, 0, 2);
+  audio_page_.attach(output_devices_combo_, 1, 2);
+  notebook_.append_page(audio_page_, "Audio");
 }
 
 void SettingsWindow::FillUniverses() {
@@ -263,4 +330,17 @@ void SettingsWindow::ReloadOla() {
   UpdateAfterSelection();
 }
 
+void SettingsWindow::SetInputAudio() {
+  const std::string& selected_device =
+      input_devices_[input_devices_combo_.get_active_row_number()];
+  Instance::Settings().audio_input = selected_device;
+  Instance::Management().StartBeatFinder();
+}
+
+void SettingsWindow::SetOutputAudio() {
+  const std::string& selected_device =
+      output_devices_[output_devices_combo_.get_active_row_number()];
+  Instance::Settings().audio_output = selected_device;
+}
+
 }  // namespace glight::gui::windows

gui/windows/settingswindow.h

@@ -30,6 +30,12 @@ class SettingsWindow : public ChildWindow {
   void SaveSelectedOlaUniverse();
   void ReloadOla();
 
+  void SetInputAudio();
+  void SetOutputAudio();
+
+  void MakeDmxPage();
+  void MakeAudioPage();
+
   Gtk::Notebook notebook_;
   Gtk::Grid dmx_page_;
   struct UniverseListColumns : public Gtk::TreeModelColumnRecord {
@@ -62,6 +68,18 @@ class SettingsWindow : public ChildWindow {
 
   Gtk::VBox midi_page_;
 
+  std::vector<std::string> input_devices_;
+  std::vector<std::string> output_devices_;
+  Gtk::Grid audio_page_;
+  Gtk::Label audio_page_label_{
+      "Select the Alsa device names to be used. The input device is used for "
+      "beat detection and volume effects. The output device is used for "
+      "playing the audio of scenes."};
+  Gtk::Label input_devices_label_{"Input device: "};
+  Gtk::ComboBoxText input_devices_combo_;
+  Gtk::Label output_devices_label_{"Output device: "};
+  Gtk::ComboBoxText output_devices_combo_;
+
   RecursionLock recursion_lock_;
 };
 

theatre/management.cpp

@@ -47,6 +47,10 @@ Management::~Management() {
 }
 
 void Management::StartBeatFinder() {
+  std::lock_guard<std::mutex> lock(_mutex);
+  // In case the beat finder is already running, it is better to stop it first
+  // so the audio device is not used twice.
+  _beatFinder.reset();
   _beatFinder = std::make_unique<BeatFinder>(settings_.audio_input);
   _beatFinder->Start();
 }

theatre/management.h

@@ -40,6 +40,14 @@ class Management {
 
   void Run();
 
+  /**
+   * Start or restart the beat finder. This is not done automatically because
+   * for testing and certain other scenarios it might not be desirable to access
+   * the audio device.
+   *
+   * If the beat finder is running, calling this function again can be used to
+   * use a new device after the device has been changed in the settings.
+   */
   void StartBeatFinder();
   BeatFinder &GetBeatFinder() { return *_beatFinder; }