Merge pull request #16 from DanielSvoboda/patch-1

adds microphone selection to the interface

src/common/config.cpp

@@ -54,6 +54,7 @@ static bool useSpecialPad = false;
 static int specialPadClass = 1;
 static bool isMotionControlsEnabled = true;
 static bool useUnifiedInputConfig = true;
+static std::string micDevice = "Default Device";
 
 // These two entries aren't stored in the config
 static bool overrideControllerColor = false;
@@ -193,6 +194,10 @@ int getCursorHideTimeout() {
     return cursorHideTimeout;
 }
 
+std::string getMicDevice() {
+    return micDevice;
+}
+
 double getTrophyNotificationDuration() {
     return trophyNotificationDuration;
 }
@@ -445,6 +450,10 @@ void setCursorHideTimeout(int newcursorHideTimeout) {
     cursorHideTimeout = newcursorHideTimeout;
 }
 
+void setMicDevice(std::string device) {
+    micDevice = device;
+}
+
 void setTrophyNotificationDuration(double newTrophyNotificationDuration) {
     trophyNotificationDuration = newTrophyNotificationDuration;
 }
@@ -643,6 +652,7 @@ void load(const std::filesystem::path& path) {
             toml::find_or<bool>(input, "isMotionControlsEnabled", isMotionControlsEnabled);
         useUnifiedInputConfig =
             toml::find_or<bool>(input, "useUnifiedInputConfig", useUnifiedInputConfig);
+        micDevice = toml::find_or<std::string>(input, "micDevice", micDevice);
 
         entry_count += input.size();
     }
@@ -826,6 +836,7 @@ void save(const std::filesystem::path& path) {
     data["Input"]["specialPadClass"] = specialPadClass;
     data["Input"]["isMotionControlsEnabled"] = isMotionControlsEnabled;
     data["Input"]["useUnifiedInputConfig"] = useUnifiedInputConfig;
+    data["Input"]["micDevice"] = micDevice;
     data["GPU"]["screenWidth"] = windowWidth;
     data["GPU"]["screenHeight"] = windowHeight;
     data["GPU"]["internalScreenWidth"] = internalScreenWidth;
@@ -927,6 +938,7 @@ void setDefaultValues() {
     controllerCustomColorRGB[0] = 0;
     controllerCustomColorRGB[1] = 0;
     controllerCustomColorRGB[2] = 255;
+    micDevice = "Default Device";
 
     // GPU
     windowWidth = 1280;

src/common/config.h

@@ -83,7 +83,9 @@ void setLogFilter(const std::string& type);
 double getTrophyNotificationDuration();
 void setTrophyNotificationDuration(double newTrophyNotificationDuration);
 int getCursorHideTimeout();
+std::string getMicDevice();
 void setCursorHideTimeout(int newcursorHideTimeout);
+void setMicDevice(std::string device);
 void setSeparateLogFilesEnabled(bool enabled);
 bool getSeparateLogFilesEnabled();
 u32 GetLanguage();

src/core/libraries/audio/sdl_in.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstring>
+#include <common/config.h>
 #include "sdl_in.h"
 
 int SDLAudioIn::AudioInit() {
@@ -43,8 +44,23 @@ int SDLAudioIn::AudioInOpen(int type, uint32_t samples_num, uint32_t freq, uint3
             fmt.channels = port.channels_num;
             fmt.freq = port.freq;
 
-            port.stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_RECORDING, &fmt,
-                                                    nullptr, nullptr);
+            std::string micDevStr = Config::getMicDevice();
+            uint32_t devId;
+
+            if (micDevStr == "None") {
+                return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
+            } else if (micDevStr == "Default Device") {
+                devId = SDL_AUDIO_DEVICE_DEFAULT_RECORDING;
+            } else {
+                try {
+                    devId = static_cast<uint32_t>(std::stoul(micDevStr));
+                } catch (const std::exception& e) {
+                    return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;
+                }
+            }
+
+            port.stream = SDL_OpenAudioDeviceStream(devId, &fmt, nullptr, nullptr);
+
             if (!port.stream) {
                 port.isOpen = false;
                 return ORBIS_AUDIO_IN_ERROR_INVALID_PORT;

src/qt_gui/settings_dialog.cpp

@@ -7,6 +7,7 @@
 #include <QFileDialog>
 #include <QHoverEvent>
 #include <QMessageBox>
+#include <SDL3/SDL.h>
 #include <fmt/format.h>
 
 #include "common/config.h"
@@ -27,6 +28,7 @@
 #include "settings_dialog.h"
 #include "ui_settings_dialog.h"
 #include "video_core/renderer_vulkan/vk_instance.h"
+
 QStringList languageNames = {"Arabic",
                              "Czech",
                              "Danish",
@@ -65,6 +67,7 @@ QMap<QString, QString> channelMap;
 QMap<QString, QString> logTypeMap;
 QMap<QString, QString> screenModeMap;
 QMap<QString, QString> chooseHomeTabMap;
+QMap<QString, QString> micMap;
 
 int backgroundImageOpacitySlider_backup;
 int bgm_volume_backup;
@@ -92,6 +95,7 @@ SettingsDialog::SettingsDialog(std::shared_ptr<gui_settings> gui_settings,
                         {tr("Graphics"), "Graphics"}, {tr("User"), "User"},
                         {tr("Input"), "Input"},       {tr("Paths"), "Paths"},
                         {tr("Debug"), "Debug"}};
+    micMap = {{tr("None"), "None"}, {tr("Default Device"), "Default Device"}};
 
     if (m_physical_devices.empty()) {
         // Populate cache of physical devices.
@@ -123,6 +127,25 @@ SettingsDialog::SettingsDialog(std::shared_ptr<gui_settings> gui_settings,
     ui->hideCursorComboBox->addItem(tr("Idle"));
     ui->hideCursorComboBox->addItem(tr("Always"));
 
+    ui->micComboBox->addItem(micMap.key("None"), "None");
+    ui->micComboBox->addItem(micMap.key("Default Device"), "Default Device");
+    SDL_InitSubSystem(SDL_INIT_AUDIO);
+    int count = 0;
+    SDL_AudioDeviceID* devices = SDL_GetAudioRecordingDevices(&count);
+    if (devices) {
+        for (int i = 0; i < count; ++i) {
+            SDL_AudioDeviceID devId = devices[i];
+            const char* name = SDL_GetAudioDeviceName(devId);
+            if (name) {
+                QString qname = QString::fromUtf8(name);
+                ui->micComboBox->addItem(qname, QString::number(devId));
+            }
+        }
+        SDL_free(devices);
+    } else {
+        qDebug() << "Erro SDL_GetAudioRecordingDevices:" << SDL_GetError();
+    }
+
     InitializeEmulatorLanguages();
     LoadValuesFromConfig();
 
@@ -441,6 +464,14 @@ void SettingsDialog::LoadValuesFromConfig() {
     ui->hideCursorComboBox->setCurrentIndex(toml::find_or<int>(data, "Input", "cursorState", 1));
     OnCursorStateChanged(toml::find_or<int>(data, "Input", "cursorState", 1));
     ui->idleTimeoutSpinBox->setValue(toml::find_or<int>(data, "Input", "cursorHideTimeout", 5));
+
+    QString micValue = QString::fromStdString(Config::getMicDevice());
+    int micIndex = ui->micComboBox->findData(micValue);
+    if (micIndex != -1) {
+        ui->micComboBox->setCurrentIndex(micIndex);
+    } else {
+        ui->micComboBox->setCurrentIndex(0);
+    }
     // First options is auto selection -1, so gpuId on the GUI will always have to subtract 1
     // when setting and add 1 when getting to select the correct gpu in Qt
     ui->graphicsAdapterBox->setCurrentIndex(toml::find_or<int>(data, "Vulkan", "gpuId", -1) + 1);
@@ -753,6 +784,7 @@ void SettingsDialog::UpdateSettings() {
     m_gui_settings->SetValue(gui::gl_playBackgroundMusic, ui->playBGMCheckBox->isChecked());
     Config::setAllowHDR(ui->enableHDRCheckBox->isChecked());
     Config::setLogType(logTypeMap.value(ui->logTypeComboBox->currentText()).toStdString());
+    Config::setMicDevice(ui->micComboBox->currentData().toString().toStdString());
     Config::setLogFilter(ui->logFilterLineEdit->text().toStdString());
     Config::setUserName(ui->userNameLineEdit->text().toStdString());
     Config::setTrophyKey(ui->trophyKeyLineEdit->text().toStdString());

src/qt_gui/settings_dialog.ui

@@ -59,7 +59,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>5</number>
+      <number>4</number>
      </property>
      <widget class="QScrollArea" name="generalTab">
       <property name="widgetResizable">
@@ -149,6 +149,19 @@
                    </property>
                   </widget>
                  </item>
+                 <item>
+                  <spacer name="verticalSpacer_9">
+                   <property name="orientation">
+                    <enum>Qt::Orientation::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>40</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
                 </layout>
                </item>
               </layout>
@@ -309,6 +322,32 @@
                <property name="bottomMargin">
                 <number>80</number>
                </property>
+               <item>
+                <widget class="QCheckBox" name="updateCheckBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>11</pointsize>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Check for Updates at Startup</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="changelogCheckBox">
+                 <property name="text">
+                  <string>Always Show Changelog</string>
+                 </property>
+                </widget>
+               </item>
                <item>
                 <widget class="QGroupBox" name="updaterComboBox">
                  <property name="sizePolicy">
@@ -396,32 +435,6 @@
                  </property>
                 </widget>
                </item>
-               <item>
-                <widget class="QCheckBox" name="updateCheckBox">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="font">
-                  <font>
-                   <pointsize>11</pointsize>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Check for Updates at Startup</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="changelogCheckBox">
-                 <property name="text">
-                  <string>Always Show Changelog</string>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
             </item>
@@ -1440,7 +1453,7 @@
           <item>
            <layout class="QVBoxLayout" name="cursorTabLayoutLeft">
             <property name="spacing">
-             <number>7</number>
+             <number>6</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
@@ -1603,6 +1616,12 @@
               <property name="title">
                <string>Controller</string>
               </property>
+              <property name="alignment">
+               <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+              <property name="flat">
+               <bool>false</bool>
+              </property>
               <layout class="QVBoxLayout" name="ControllerLayout">
                <property name="spacing">
                 <number>0</number>
@@ -1615,27 +1634,14 @@
                </property>
                <item>
                 <widget class="QCheckBox" name="motionControlsCheckBox">
-                 <property name="text">
-                  <string>Enable Motion Controls</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="controllerWidgetSpacer" native="true">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
                  <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
+                 <property name="text">
+                  <string>Enable Motion Controls</string>
                  </property>
                 </widget>
                </item>
@@ -1652,17 +1658,33 @@
            <number>0</number>
           </property>
           <item>
-           <spacer name="emptyVerticalSpacerBottom">
+           <layout class="QHBoxLayout" name="micTabLayoutLeft">
+            <item>
+             <widget class="QGroupBox" name="MicGroupBox">
+              <property name="title">
+               <string>Microphone</string>
+              </property>
+              <widget class="QComboBox" name="micComboBox">
+               <property name="geometry">
+                <rect>
+                 <x>14</x>
+                 <y>33</y>
+                 <width>431</width>
+                 <height>31</height>
+                </rect>
+               </property>
+              </widget>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_8">
               <property name="orientation">
                <enum>Qt::Orientation::Vertical</enum>
               </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-            </property>
               <property name="sizeHint" stdset="0">
                <size>
-              <width>20</width>
-              <height>20</height>
+                <width>0</width>
+                <height>40</height>
                </size>
               </property>
              </spacer>
@@ -1670,6 +1692,8 @@
            </layout>
           </item>
          </layout>
+        </item>
+       </layout>
       </widget>
      </widget>
      <widget class="QScrollArea" name="pathsTab">

src/qt_gui/translations/en_US.ts

@@ -1582,6 +1582,18 @@
         <source>Hide Cursor Idle Timeout</source>
         <translation>Hide Cursor Idle Timeout</translation>
     </message>
+    <message>
+        <source>Microphone</source>
+        <translation>Microphone</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>Default Device</source>
+        <translation>Default Device</translation>
+    </message>
     <message>
         <source>s</source>
         <translation>s</translation>