add toggle to disable automatic gain

.gitignore

@@ -1,20 +1,3 @@
-# Ignore build and output directories
+/build
-/build/
+.vscode
-/.flatpak-builder/
+/submodules/arrpc
-
-# Ignore flatpak-builder cache
-/.flatpak-builder-cache/
-
-# Ignore flatpak-builder log files
-/*.log
-
-# Ignore flatpak-builder generated files
-/*.flatpak
-/*.flatpak-builder
-/*.flatpak-origin
-
-# Ignore specific files or directories
-/override.json
-/metadata/
-/manifest.json
-/CMakeLists.txt.user

CMakeLists.txt

@@ -46,14 +46,6 @@ set(discord-screenaudio_SRC
   src/userscript.cpp
   src/centralwidget.cpp
   src/localserver.cpp
-  src/centralwidget.h
-  src/discordpage.h
-  src/localserver.h
-  src/log.h
-  src/mainwindow.h
-  src/streamdialog.h
-  src/userscript.h
-  src/virtmic.h
   resources.qrc
 )
 

assets/userscript.js

@@ -1,12 +1,14 @@
 navigator.mediaDevices.chromiumGetDisplayMedia =
   navigator.mediaDevices.getDisplayMedia;
+navigator.mediaDevices.chromiumGetUserMedia =
+  navigator.mediaDevices.getUserMedia;
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 const getAudioDevice = async (nameOfAudioDevice) => {
-  await navigator.mediaDevices.getUserMedia({
+  await navigator.mediaDevices.chromiumGetUserMedia({
     audio: true,
   });
   let audioDevice;
@@ -23,18 +25,29 @@ const getAudioDevice = async (nameOfAudioDevice) => {
   return audioDevice;
 };
 
+function setGetUserMedia() {
+  const getUserMedia = async (constraints) => {
+    return await navigator.mediaDevices.chromiumGetUserMedia({
+      video: constraints?.video || false,
+      audio: { ...constraints?.audio, autoGainControl },
+    });
+  };
+  navigator.mediaDevices.getUserMedia = getUserMedia;
+}
+
 function setGetDisplayMedia(video = true, overrideArgs = undefined) {
   const getDisplayMedia = async (...args) => {
     var id;
     try {
       let myDiscordAudioSink = await getAudioDevice(
-        "discord-awesomeaudio-virtmic"
+        "discord-screenaudio-virtmic"
       );
       id = myDiscordAudioSink.deviceId;
     } catch (error) {
       id = "default";
     }
-    let captureSystemAudioStream = await navigator.mediaDevices.getUserMedia({
+    let captureSystemAudioStream =
+      await navigator.mediaDevices.chromiumGetUserMedia({
         audio: {
           // We add our audio constraints here, to get a list of supported constraints use navigator.mediaDevices.getSupportedConstraints();
           // We must capture a microphone, we use default since its the only deviceId that is the same for every Chromium user
@@ -68,6 +81,7 @@ function setGetDisplayMedia(video = true, overrideArgs = undefined) {
 }
 
 setGetDisplayMedia();
+setGetUserMedia();
 
 let userscript;
 let muteBtn;
@@ -76,6 +90,7 @@ let streamStartBtn;
 let streamStartBtnInitialDisplay;
 let streamStartBtnClone;
 let resolutionString;
+let autoGainControl = true;
 const clonedElements = [];
 const hiddenElements = [];
 let wasStreamActive = false;
@@ -159,6 +174,10 @@ function main() {
     streamStartBtnClone.remove();
   });
 
+  userscript.getPref("disableAutomaticGain", false).then((disabled) => {
+    autoGainControl = !disabled;
+  });
+
   function updateUserstyles() {
     userscript.log("Loading userstyles...");
     userscript.loadingMessage = "Loading userstyles...";
@@ -240,7 +259,7 @@ function main() {
         } else {
           aboutEl = document.createElement("div");
         }
-        aboutEl.innerText = `discord-awesomeaudio ${userscript.version}`;
+        aboutEl.innerText = `discord-screenaudio ${userscript.version}`;
         aboutEl.style.fontSize = "12px";
         aboutEl.style.color = "var(--text-muted)";
         aboutEl.style.textTransform = "none";
@@ -319,7 +338,7 @@ function main() {
           const title = document.createElement("h2");
           title.className =
             "h1-3iMExa title-lXcL8p defaultColor-3Olr-9 defaultMarginh1-1UYutH";
-          title.innerText = "discord-awesomeaudio";
+          title.innerText = "discord-screenaudio";
           section.appendChild(title);
 
           section.appendChild(
@@ -342,17 +361,7 @@ function main() {
 
           section.appendChild(
             createSwitch(
-              "Allow audio from your mic (and audio you pass through) to become stereo",
+              "Move discord-screenaudio to the system tray instead of closing",
-              await userscript.getBoolPref("stereoMic", false),
-              (enabled) => {
-                userscript.setStereoMic(enabled);
-              }
-            )
-          );
-
-            section.appendChild(
-            createSwitch(
-              "Move discord-awesomeaudio to the system tray instead of closing",
               await userscript.getBoolPref("trayIcon", false),
               (enabled) => {
                 userscript.setTrayIcon(enabled);
@@ -362,7 +371,7 @@ function main() {
 
           section.appendChild(
             createSwitch(
-              "Start discord-awesomeaudio hidden to tray",
+              "Start discord-screenaudio hidden to tray",
               await userscript.getPref("startHidden", false),
               (hidden) => {
                 userscript.setPref("startHidden", hidden);
@@ -378,5 +387,29 @@ function main() {
         }
       }
     }
+
+    for (const el of document.getElementsByClassName("sensitivity-3A7Gs9")) {
+      if (
+        el.getElementsByTagName("div").length > 0 &&
+        !document.getElementById("discord-screenaudio-gaintoggle")
+      ) {
+        const toggle = createSwitch(
+          "Disable automatic gain",
+          await userscript.getPref("disableAutomaticGain", false),
+          async (disabled) => {
+            await userscript.setPref("disableAutomaticGain", disabled);
+            autoGainControl = !disabled;
+            setGetUserMedia();
+            if (disabled)
+              userscript.showInformation(
+                "discord-screenaudio",
+                "If you are currently in a call, this setting may only take effect after you rejoin the call or restart discord-screenaudio."
+              );
+          }
+        );
+        toggle.id = "discord-screenaudio-gaintoggle";
+        el.getElementsByTagName("div")[0].appendChild(toggle);
+      }
+    }
   }, 500);
 }

assets/vencord/VencordNativeStub.ts

@@ -1,85 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-/// <reference path="../src/modules.d.ts" />
-/// <reference path="../src/globals.d.ts" />
-
-import monacoHtml from "~fileContent/../src/components/monacoWin.html";
-import * as DataStore from "../src/api/DataStore";
-import { debounce } from "../src/utils";
-import { getTheme, Theme } from "../src/utils/discord";
-
-// Discord deletes this so need to store in variable
-const { localStorage } = window;
-
-// listeners for ipc.on
-const cssListeners = new Set<(css: string) => void>();
-const NOOP = () => { };
-const NOOP_ASYNC = async () => { };
-
-const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
-
-// probably should make this less cursed at some point
-window.VencordNative = {
-    native: {
-        getVersions: () => ({}),
-        openExternal: async (url) => void open(url, "_blank")
-    },
-
-    updater: {
-        getRepo: async () => ({ ok: true, value: "https://github.com/Vendicated/Vencord" }),
-        getUpdates: async () => ({ ok: true, value: [] }),
-        update: async () => ({ ok: true, value: false }),
-        rebuild: async () => ({ ok: true, value: true }),
-    },
-
-    quickCss: {
-        get: () => DataStore.get("VencordQuickCss").then(s => s ?? ""),
-        set: async (css: string) => {
-            await DataStore.set("VencordQuickCss", css);
-            cssListeners.forEach(l => l(css));
-        },
-        addChangeListener(cb) {
-            cssListeners.add(cb);
-        },
-        openFile: NOOP_ASYNC,
-        async openEditor() {
-            const features = `popup,width=${Math.min(window.innerWidth, 1000)},height=${Math.min(window.innerHeight, 1000)}`;
-            const win = open("about:blank", "VencordQuickCss", features);
-            if (!win) {
-                alert("Failed to open QuickCSS popup. Make sure to allow popups!");
-                return;
-            }
-
-            win.setCss = setCssDebounced;
-            win.getCurrentCss = () => VencordNative.quickCss.get();
-            win.getTheme = () =>
-                getTheme() === Theme.Light
-                    ? "vs-light"
-                    : "vs-dark";
-
-            win.document.write(monacoHtml);
-        },
-    },
-
-    settings: {
-        get: () => localStorage.getItem("VencordSettings") || "{}",
-        set: async (s: string) => localStorage.setItem("VencordSettings", s),
-        getSettingsDir: async () => "LocalStorage"
-    }
-};

assets/vencord/plugin.js

@@ -1,14 +0,0 @@
-import definePlugin from "../utils/types";
-
-export default definePlugin({
-  name: "discord-awesomeaudio",
-  authors: [
-    {
-      name: "retard",
-      id: 205966226709676099n,
-    },
-  ],
-  required: true,
-  description: "UI patches for discord-screenaudio.",
-  patches: [],
-});

assets/vencord/settings.patch

@@ -1,15 +0,0 @@
---- a/src/components/VencordSettings/VencordTab.tsx
-+++ b/src/components/VencordSettings/VencordTab.tsx
-@@ -87,10 +87,10 @@ function VencordSettings() {
-                 <Card className={cl("quick-actions-card")}>
-                     {IS_WEB ? (
-                         <Button
--                            onClick={() => require("../Monaco").launchMonacoEditor()}
-+                            onClick={() => VencordNative.ipc.send(IpcEvents.OPEN_EXTERNAL, settingsDir)}
-                             size={Button.Sizes.SMALL}
-                             disabled={settingsDir === "Loading..."}>
--                            Open QuickCSS File
-+                            Launch Directory
-                         </Button>
-                     ) : (
-                         <React.Fragment>

install.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-is_package_installed() {
-  if command -v "$1" >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-if [[ -f /etc/os-release ]]; then
-  . /etc/os-release
-  if [[ "$ID" == "ubuntu" || "$ID_LIKE" == "ubuntu" ]]; then
-    if ! is_package_installed flatpak-builder; then
-      sudo apt update
-      sudo apt install -y flatpak-builder
-    fi
-  elif [[ "$ID" == "fedora" || "$ID_LIKE" == "fedora" ]]; then
-    if ! is_package_installed flatpak-builder; then
-      sudo dnf install -y flatpak-builder
-    fi
-  elif [[ "$ID" == "void" ]]; then
-    if ! is_package_installed flatpak-builder; then
-      sudo xbps-install -Sy flatpak-builder
-    fi
-  fi
-fi
-
-flatpak install flathub org.kde.Sdk//5.15-22.08
-
-flatpak install flathub io.qt.qtwebengine.BaseApp//5.15-22.08
-
-flatpak-builder build-dir lol.deadzone.discord-awesomeaudio.json --install --user --force-clean
-
-echo "[Desktop Entry]
-Name=Discord Awesome Audio
-Exec=flatpak run lol.deadzone.discord-awesomeaudio
-Icon=/path/to/application/icon.png
-Type=Application
-Categories=AudioVideo;Network;" > ~/.local/share/applications/discord-awesomeaudio.desktop
-
-chmod +x ~/.local/share/applications/discord-awesomeaudio.desktop

lol.deadzone.discord-awesomeaudio.json

@@ -1,44 +0,0 @@
-{
-  "app-id": "lol.deadzone.discord-awesomeaudio",
-  "runtime": "org.kde.Platform",
-  "runtime-version": "5.15-22.08",
-  "sdk": "org.kde.Sdk",
-  "base": "io.qt.qtwebengine.BaseApp",
-  "base-version": "5.15-22.08",
-  "command": "discord-screenaudio",
-  "finish-args": [
-    "--share=ipc",
-    "--share=network",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--socket=pulseaudio",
-    "--filesystem=xdg-videos:ro",
-    "--filesystem=xdg-pictures:ro",
-    "--filesystem=xdg-download",
-    "--filesystem=xdg-run/pipewire-0",
-    "--device=all",
-    "--talk-name=org.kde.StatusNotifierWatcher",
-    "--env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess",
-    "--talk-name=org.freedesktop.Notifications",
-    "--talk-name=org.kde.kglobalaccel"
-  ],
-  "modules": [
-    {
-      "name": "discord-screenaudio",
-      "buildsystem": "cmake-ninja",
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-        "-DGIT_SUBMODULE=OFF"
-      ],
-      "sources": [
-        {
-          "type": "dir",
-          "path": "."
-        }
-      ]
-    }
-  ],
-  "finish-install": {
-    "desktop-file": "[Desktop Entry]\nName=Discord Awesome Audio\nExec=flatpak run lol.deadzone.discord-awesomeaudio\nIcon=/path/to/application/icon.png\nType=Application\nCategories=AudioVideo;Network;"
-  }
-}

resources.qrc

@@ -1,12 +1,9 @@
+<!DOCTYPE RCC>
 <RCC>
-    <qresource prefix="/">
+  <qresource>
     <file>assets/userscript.js</file>
     <file>assets/arrpc_bridge_mod.js</file>
     <file>assets/arrpc.js</file>
     <file>assets/de.shorsh.discord-screenaudio.png</file>
-        <file>assets/vencord/vencord.js</file>
-        <file>assets/vencord/settings.patch</file>
-        <file>assets/vencord/plugin.js</file>
-        <file>assets/vencord/VencordNativeStub.ts</file>
   </qresource>
 </RCC>

scripts/build_vencord.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-cd "$(dirname "$0")/../submodules"
-
-echo_status() {
-  echo
-  echo
-  echo "-> $1..."
-}
-
-if [ ! -d "Vencord" ]; then
-  echo_status "Cloning Vencord"
-  git clone https://github.com/Vendicated/Vencord.git
-  cd Vencord
-else
-  echo_status "Fetching Vencord changes"
-  cd Vencord
-  git fetch
-fi
-
-echo_status "Checking out latest commit"
-git reset --hard HEAD
-git checkout main
-#git reset --hard devbuild
-
-echo_status "Installing dependencies"
-pnpm i
-
-echo_status "Patching Vencord"
-cp -v ../../assets/vencord/plugin.js ./src/plugins/discord-screenaudio.js
-cp -v ../../assets/vencord/VencordNativeStub.ts ./browser/VencordNativeStub.ts
-patch -p1 -i ../../assets/vencord/settings.patch
-
-echo_status "Building Vencord"
-pnpm run buildWeb
-
-echo_status "Copying built file"
-cp -v ./dist/browser.js ../../assets/vencord/vencord.js

src/centralwidget.cpp

@@ -7,7 +7,6 @@
 #include <QWebEngineScript>
 #include <QWebEngineScriptCollection>
 #include <QWebEngineSettings>
-#include <QWebEngineView>
 
 CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) {
   setStyleSheet("background-color:#313338;");

src/centralwidget.h

@@ -1,5 +1,4 @@
-#ifndef CENTRALWIDGET_H
+#pragma once
-#define CENTRALWIDGET_H
 
 #include <QLabel>
 #include <QVBoxLayout>
@@ -8,28 +7,23 @@
 #include <QWebEngineView>
 #include <QWidget>
 
-#ifdef KNOTIFICATIONS
-constexpr bool USE_KF5_NOTIFICATIONS = true;
-#else
-constexpr bool USE_KF5_NOTIFICATIONS = false;
-#endif
-
 class CentralWidget : public QWidget {
   Q_OBJECT
 
 public:
   CentralWidget(QWidget *parent = nullptr);
 
-public slots:
-  void setLoadingIndicator(QString text);
-
 private:
   void setupWebView();
-
   QVBoxLayout *m_layout;
   QWebEngineView *m_webView;
-  QLabel *m_loadingLabel;
+#ifdef KNOTIFICATIONS
-  bool m_useKF5Notifications;
+  bool m_useKF5Notifications = true;
-};
+#else
+  bool m_useKF5Notifications = false;
+#endif
+  QLabel *m_loadingLabel = nullptr;
 
-#endif // CENTRALWIDGET_H
+public Q_SLOTS:
+  void setLoadingIndicator(QString text);
+};

src/discordpage.cpp

@@ -36,16 +36,7 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
 
   injectFile(&DiscordPage::injectScript, "userscript.js",
              ":/assets/userscript.js");
-  QFile vencord(":/assets/vencord/vencord.js");
+
-    if (!vencord.open(QIODevice::ReadOnly))
-      qFatal("Failed to load vencord source with error: %s",
-             vencord.errorString().toLatin1().constData());
-    injectScript(
-        "vencord.js",
-        QString("window.discordScreenaudioVencordSettings = `%1`; %2")
-            .arg(m_userScript.vencordSend("VencordGetSettings", {}).toString(),
-                 vencord.readAll()));
-   vencord.close();
   setupUserStyles();
   setupArrpc();
 }

src/main.cpp

@@ -16,11 +16,11 @@
 int main(int argc, char *argv[]) {
   QApplication app(argc, argv);
 
-  QApplication::setApplicationName("discord-awesomeaudio");
+  QApplication::setApplicationName("discord-screenaudio");
   QApplication::setWindowIcon(
       QIcon(":assets/de.shorsh.discord-screenaudio.png"));
   QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
-  QApplication::setDesktopFileName("lol.deadzone.discord-awesomeaudio");
+  QApplication::setDesktopFileName("de.shorsh.discord-screenaudio");
 
   qSetMessagePattern("[%{category}] %{message}");
 
@@ -57,10 +57,10 @@ int main(int argc, char *argv[]) {
   MainWindow w(parser.isSet(notifySendOption));
 
   // Check if discord is already running
-  QString program_name = "discord-awesomeaudio";
+  QString program_name = "discord-screenaudio";
   if (isProgramRunning(program_name)) {
     // if running show error message
-    showErrorMessage("discord-awesomeaudio is already running");
+    showErrorMessage("discord-screenaudio is already running");
     return 1;
   }
 

src/mainwindow.cpp

@@ -12,28 +12,13 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QShortcut>
 #include <QSpacerItem>
 #include <QThread>
 #include <QTimer>
 #include <QUrl>
 #include <QWebEngineFullScreenRequest>
-#include <QWebEngineProfile>
-#include <QWebEngineUrlRequestInterceptor>
 #include <QWidget>
 
-// Custom network interceptor class
-class NetworkInterceptor : public QWebEngineUrlRequestInterceptor {
-public:
-    NetworkInterceptor(QObject* parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) {}
-
-    void interceptRequest(QWebEngineUrlRequestInfo& info) override {
-        // Modify the request headers here as needed
-        info.setHttpHeader("Access-Control-Allow-Origin", "*");
-        info.setHttpHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-    }
-};
-
 MainWindow *MainWindow::m_instance = nullptr;
 
 MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
@@ -44,15 +29,8 @@ MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
   m_settings->setValue("useNotifySend", useNotifySend);
   m_centralWidget = new CentralWidget(this);
   setCentralWidget(m_centralWidget);
-
-    // Create and install the network interceptor
-    NetworkInterceptor* networkInterceptor = new NetworkInterceptor(this);
-    QWebEngineProfile::defaultProfile()->setRequestInterceptor(networkInterceptor);
-
   setupTrayIcon();
   setMinimumSize(800, 300);
-    connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this),
-            &QShortcut::activated, this, &MainWindow::toggleOrCloseWindow);
   if (m_settings->contains("geometry")) {
     restoreGeometry(m_settings->value("geometry").toByteArray());
   } else {
@@ -71,9 +49,6 @@ void MainWindow::fullScreenRequested(
   fullScreenRequest.accept();
   if (fullScreenRequest.toggleOn()) {
     m_wasMaximized = isMaximized();
-        if (!m_wasMaximized) {
-            showNormal();
-        }
     showFullScreen();
   } else {
     m_wasMaximized ? showMaximized() : showNormal();
@@ -86,7 +61,7 @@ void MainWindow::setupTrayIcon() {
     return;
 
   auto aboutAction = new QAction(
-            "discord-awesomeaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
+      "discord-screenaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
   aboutAction->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
   aboutAction->setEnabled(false);
 
@@ -104,7 +79,12 @@ void MainWindow::setupTrayIcon() {
 
   connect(m_trayIcon, &QSystemTrayIcon::activated, [this](auto reason) {
     if (reason == QSystemTrayIcon::Trigger) {
-            toggleOrCloseWindow();
+      if (isVisible()) {
+        hide();
+      } else {
+        show();
+        activateWindow();
+      }
     }
   });
 }
@@ -121,7 +101,7 @@ void MainWindow::cleanTrayIcon() {
 
 void MainWindow::setupSettings() {
   m_settings =
-            new QSettings("discord-awesomeaudio", "discord-awesomeaudio", this);
+      new QSettings("discord-screenaudio", "discord-screenaudio", this);
   m_settings->beginGroup("settings");
   m_settings->endGroup();
 }
@@ -151,15 +131,3 @@ MainWindow *MainWindow::instance() { return m_instance; }
 CentralWidget *MainWindow::centralWidget() {
   return instance()->m_centralWidget;
 };
-
-void MainWindow::toggleOrCloseWindow() {
-    if (isVisible()) {
-        if (m_trayIcon == nullptr)
-            QApplication::quit();
-        else
-            hide();
-    } else {
-        show();
-        activateWindow();
-    }
-}

src/mainwindow.h

@@ -10,7 +10,6 @@
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
 #include <QVector>
-#include <QWebEngineUrlRequestInterceptor>
 
 class MainWindow : public QMainWindow {
   Q_OBJECT
@@ -25,6 +24,7 @@ private:
   void setupTrayIcon();
   void cleanTrayIcon();
   void setupSettings();
+  QWebEngineProfile *prepareProfile();
   void closeEvent(QCloseEvent *event) override;
   QSystemTrayIcon *m_trayIcon = nullptr;
   QMenu *m_trayIconMenu;
@@ -36,5 +36,4 @@ private:
 public Q_SLOTS:
   void setTrayIcon(bool enabled);
   void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
-    void toggleOrCloseWindow();
 };

src/userscript.cpp

@@ -21,7 +21,6 @@ UserScript::UserScript() : QObject() {
   setupVirtmic();
 }
 
-
 void UserScript::setupHelpMenu() {
 #ifdef KXMLGUI
   m_kxmlgui = true;
@@ -84,7 +83,8 @@ void UserScript::setupShortcutsDialog() {
 
 void UserScript::setupStreamDialog() {
   m_streamDialog = new StreamDialog(MainWindow::instance());
-  connect(m_streamDialog, &StreamDialog::requestedStreamStart, this, &UserScript::startStream);
+  connect(m_streamDialog, &StreamDialog::requestedStreamStart, this,
+          &UserScript::startStream);
 }
 
 void UserScript::setupVirtmic() {
@@ -155,13 +155,13 @@ void UserScript::startVirtmic(QString target) {
   m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
 }
 
-void UserScript::startStream(bool video, bool audio, int width, int height, int frameRate, QString target) {
+void UserScript::startStream(bool video, bool audio, int width, int height,
+                             int frameRate, QString target) {
   stopVirtmic();
   startVirtmic(audio ? target : "[None]");
   // Wait a bit for the virtmic to start
-  QTimer::singleShot(200, [=]() {
+  QTimer::singleShot(
-        emit streamStarted(video, width, height, frameRate);
+      200, [=]() { emit streamStarted(video, width, height, frameRate); });
-    });
 }
 
 void UserScript::showStreamDialog() {
@@ -173,7 +173,8 @@ void UserScript::showStreamDialog() {
 }
 
 void UserScript::showThemeDialog() {
-  auto url = QInputDialog::getText(MainWindow::instance(), "Theme Installation", "Please enter the URL of the Theme");
+  auto url = QInputDialog::getText(MainWindow::instance(), "Theme Installation",
+                                   "Please enter the URL of the Theme");
   if (url != "")
     emit shouldInstallUserStyles(url);
 }
@@ -182,67 +183,6 @@ void UserScript::installUserStyles(QString url) {
   emit shouldInstallUserStyles(url);
 }
 
-QVariant UserScript::vencordSend(QString event, QVariantList args) {
+void UserScript::showInformation(QString title, QString message) {
-  QString configFolder =
+  QMessageBox::information(MainWindow::instance(), title, message);
-      QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) +
-      "/vencord";
-  QString quickCssFile = configFolder + "/quickCss.css";
-  QString settingsFile = configFolder + "/settings.json";
-
-  if (!QDir().exists(configFolder))
-    QDir().mkpath(configFolder);
-
-  if (event == "VencordGetRepo") {
-    return true;
-  }
-  if (event == "VencordGetSettingsDir") {
-    return configFolder;
-  }
-  if (event == "VencordGetQuickCss") {
-    if (QFile::exists(quickCssFile)) {
-      QFile file(quickCssFile);
-      if (!file.open(QIODevice::ReadOnly))
-        qFatal("Failed to load %s with error: %s",
-               quickCssFile.toLatin1().constData(),
-               file.errorString().toLatin1().constData());
-      auto content = file.readAll();
-      file.close();
-      return QString(content);
-    } else
-      return "";
-  }
-  if (event == "VencordGetSettings") {
-    if (QFile::exists(settingsFile)) {
-      QFile file(settingsFile);
-      if (!file.open(QIODevice::ReadOnly))
-        qFatal("Failed to load %s with error: %s",
-               settingsFile.toLatin1().constData(),
-               file.errorString().toLatin1().constData());
-      auto content = file.readAll();
-      file.close();
-      return QString(content);
-    } else
-      return "{}";
-  }
-  if (event == "VencordSetSettings") {
-    QFile file(settingsFile);
-    if (!file.open(QIODevice::WriteOnly))
-      qFatal("Failed to load %s with error: %s",
-             settingsFile.toLatin1().constData(),
-             file.errorString().toLatin1().constData());
-    file.write(args[0].toString().toUtf8());
-    file.close();
-    return true;
-  }
-  if (event == "VencordGetUpdates") {
-    return QVariantMap{{"ok", true}, {"value", QVariantList()}};
-  }
-  if (event == "VencordOpenExternal") {
-    QDesktopServices::openUrl(QUrl(args[0].toString()));
-    return true;
-  }
-  if (event == "VencordOpenQuickCss") {
-    return true;
-  }
-  assert(false);
 }

src/userscript.h

@@ -1,10 +1,9 @@
 #pragma once
 
 #include "streamdialog.h"
-#include <QProcess>
+
 #include <QObject>
-#include <QDir>
+#include <QProcess>
-#include <QDesktopServices>
 
 #ifdef KXMLGUI
 #include <KAboutData>
@@ -29,11 +28,12 @@ class UserScript : public QObject {
 public:
   UserScript();
   bool isVirtmicRunning();
-    Q_PROPERTY(QString version READ version CONSTANT)
+  Q_PROPERTY(QString version READ version CONSTANT);
-    Q_PROPERTY(bool kxmlgui MEMBER m_kxmlgui CONSTANT)
+  Q_PROPERTY(bool kxmlgui MEMBER m_kxmlgui CONSTANT);
-    Q_PROPERTY(bool kglobalaccel MEMBER m_kglobalaccel CONSTANT)
+  Q_PROPERTY(bool kglobalaccel MEMBER m_kglobalaccel CONSTANT);
-    Q_PROPERTY(QString userstyles MEMBER m_userstyles NOTIFY userstylesChanged)
+  Q_PROPERTY(QString userstyles MEMBER m_userstyles NOTIFY userstylesChanged);
-    Q_PROPERTY(QString loadingMessage MEMBER m_loadingMessage NOTIFY loadingMessageChanged)
+  Q_PROPERTY(QString loadingMessage MEMBER m_loadingMessage NOTIFY
+                 loadingMessageChanged);
 
 private:
   QProcess m_virtmicProcess;
@@ -42,22 +42,17 @@ private:
   bool m_kglobalaccel = false;
   QString m_userstyles;
   QString m_loadingMessage;
-
-    QString m_vencordSettings;
-
-    void setupHelpMenu();
-    void setupShortcutsDialog();
-    void setupStreamDialog();
-    void setupVirtmic();
-
 #ifdef KXMLGUI
   KHelpMenu *m_helpMenu;
 #ifdef KGLOBALACCEL
   KActionCollection *m_actionCollection;
   KShortcutsDialog *m_shortcutsDialog;
 #endif
-
 #endif
+  void setupHelpMenu();
+  void setupShortcutsDialog();
+  void setupStreamDialog();
+  void setupVirtmic();
 
 Q_SIGNALS:
   void muteToggled();
@@ -77,13 +72,13 @@ public Q_SLOTS:
   void showShortcutsDialog();
   void showHelpMenu();
   void showStreamDialog();
+  void showInformation(QString title, QString message);
   void stopVirtmic();
   void startVirtmic(QString target);
   void showThemeDialog();
   void installUserStyles(QString url);
-    QVariant vencordSend(QString event, QVariantList args);
 
 private Q_SLOTS:
-    void startStream(bool video, bool audio, int width, int height, int frameRate, QString target);
+  void startStream(bool video, bool audio, int width, int height, int frameRate,
+                   QString target);
 };
-

src/virtmic.cpp

@@ -6,7 +6,7 @@
 
 namespace Virtmic {
 
-const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-awesomeaudio", "pavucontrol", "PulseAudio Volume Control", "OBS", "OBS-Monitor", "OBS/OBS-MONITOR"};
+const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
 
 const std::string nullstr = "";
 const std::string &getTarget(const pipewire::spa::dict &props) {
@@ -86,12 +86,6 @@ void start(QString _target) {
 
       auto &parent = nodes.at(parent_id);
       std::string name = getTarget(parent.props);
-      if (EXCLUDE_TARGETS.contains(QString::fromStdString(name)))
-        continue;
-
-      if (parent.props.count("media.class") && (parent.props.at("media.class") == "Audio/Source" || parent.props.at("media.class") == "Audio/Source/Virtual"))
-        continue;
-
       if (name == target ||
           (target == "[All Desktop Audio]" &&
            !EXCLUDE_TARGETS.contains(QString::fromStdString(name)))) {
@@ -114,7 +108,7 @@ void start(QString _target) {
   std::string target = _target.toUtf8().toStdString();
 
   auto virtual_mic = core.create("adapter",
-                                 {{"node.name", "discord-awesomeaudio-virtmic"},
+                                 {{"node.name", "discord-screenaudio-virtmic"},
                                   {"media.class", "Audio/Source/Virtual"},
                                   {"factory.name", "support.null-audio-sink"},
                                   {"audio.channels", "2"},

submodules/Vencord

@@ -1 +0,0 @@
-Subproject commit 62b2acebe6806c7b0e2ca6a43c6b2419a627b8dc

uninstall.sh

@@ -1,2 +0,0 @@
-flatpak remove lol.deadzone.discord-awesomeaudio
-rm ~/.local/share/applications/discord-awesomeaudio.desktop

update.sh

@@ -1,3 +0,0 @@
-git pull
-./uninstall.sh
-./install.sh