work

.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

@@ -45,15 +45,7 @@ set(discord-screenaudio_SRC
   src/log.cpp
   src/userscript.cpp
   src/centralwidget.cpp
-  src/localserver.cpp
+  src/dependencycheck.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
 )
 

README.md

@@ -62,9 +62,6 @@ You have multiple options:
 With apt:
 `apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev libkf5xmlgui-dev libkf5globalaccel-dev pkg-config libpipewire-0.3-dev git`
 
-With dnf:
-`dnf install @development-tools cmake qt5-qtbase-devel qt5-qtwebengine-devel kf5-knotifications-devel kf5-kxmlgui-devel kf5-kglobalaccel-devel pkgconfig pipewire-devel git`
-
 ### Building
 
 First, clone the repository:

assets/userscript.js

@@ -28,7 +28,7 @@ function setGetDisplayMedia(video = true, overrideArgs = undefined) {
     var id;
     try {
       let myDiscordAudioSink = await getAudioDevice(
-        "discord-awesomeaudio-virtmic"
+        "discord-screenaudio-virtmic"
       );
       id = myDiscordAudioSink.deviceId;
     } catch (error) {
@@ -240,7 +240,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 +319,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(
@@ -340,19 +340,9 @@ function main() {
           //   })
           // );
 
-            section.appendChild(
+          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 +352,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);

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/userscript.js</file>
-        <file>assets/arrpc_bridge_mod.js</file>
+    <file>assets/arrpc_bridge_mod.js</file>
-        <file>assets/arrpc.js</file>
+    <file>assets/arrpc.js</file>
-        <file>assets/de.shorsh.discord-screenaudio.png</file>
+    <file>assets/de.shorsh.discord-screenaudio.png</file>
-        <file>assets/vencord/vencord.js</file>
+  </qresource>
-        <file>assets/vencord/settings.patch</file>
+</RCC>
-        <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/dependencycheck.cpp

@@ -0,0 +1,10 @@
+#include "dependencycheck.h"
+#include "pipewire-0.3/pipewire/version.h"
+
+#include <QMessageBox>
+
+void checkDependencies() {
+  QString versionPipewire(pw_get_library_version());
+  QMessageBox::information(nullptr, "Dependency Check",
+                           QString("Pipewire: v%1").arg(versionPipewire));
+}

src/dependencycheck.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void checkDependencies();

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();
 }
@@ -291,11 +282,10 @@ void DiscordPage::javaScriptConsoleMessage(
           ansi += "\033[" + cssAnsiColorMap[color] + "m";
       }
     }
-    if (endOfStyles < lines.length())
+    qDebug(discordLog) << (ansi + lines[0].trimmed() + "\033[0m " +
-      qDebug(discordLog) << (ansi + lines[0].trimmed() + "\033[0m " +
+                           lines[endOfStyles].trimmed())
-                             lines[endOfStyles].trimmed())
+                              .toUtf8()
-                                .toUtf8()
+                              .constData();
-                                .constData();
     for (auto line : lines.mid(endOfStyles + 1)) {
       qDebug(discordLog) << line.toUtf8().constData();
     }

src/localserver.cpp

@@ -1,22 +0,0 @@
-#include "localserver.h"
-
-bool isProgramRunning(const QString &program_name) {
-  QLocalSocket socket;
-  socket.connectToServer(program_name);
-  if (socket.waitForConnected()) {
-    return true; // program is already running
-  }
-  return false;
-}
-
-void showErrorMessage(const char *text) {
-  QMessageBox msgBox;
-
-  msgBox.setIcon(QMessageBox::Critical);
-  msgBox.setText(text);
-  msgBox.setStandardButtons(QMessageBox::Ok);
-  msgBox.setDefaultButton(QMessageBox::Ok);
-  msgBox.setWindowIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-
-  msgBox.exec();
-}

src/localserver.h

@@ -1,9 +0,0 @@
-#pragma once
-#include "mainwindow.h"
-
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QMessageBox>
-
-bool isProgramRunning(const QString &program_name);
-void showErrorMessage(const char *text);

src/main.cpp

@@ -1,4 +1,4 @@
-#include "localserver.h"
+#include "dependencycheck.h"
 #include "mainwindow.h"
 #include "virtmic.h"
 
@@ -8,19 +8,15 @@
 
 #include <QApplication>
 #include <QCommandLineParser>
-#include <QLocalServer>
-#include <QLocalSocket>
 #include <QLoggingCategory>
-#include <QMessageBox>
 
 int main(int argc, char *argv[]) {
   QApplication app(argc, argv);
-
+  QApplication::setApplicationName("discord-screenaudio");
-  QApplication::setApplicationName("discord-awesomeaudio");
   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}");
 
@@ -54,21 +50,9 @@ int main(int argc, char *argv[]) {
             "--remote-debugging-port=9222 " +
                 qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
 
+  checkDependencies();
+
   MainWindow w(parser.isSet(notifySendOption));
-
-  // Check if discord is already running
-  QString program_name = "discord-awesomeaudio";
-  if (isProgramRunning(program_name)) {
-    // if running show error message
-    showErrorMessage("discord-awesomeaudio is already running");
-    return 1;
-  }
-
-  // open server so we can check if discord is running
-  QLocalServer server;
-  server.listen(program_name);
-  QObject::connect(&server, &QLocalServer::newConnection, []() {});
-
   w.show();
 
   return app.exec();

src/mainwindow.cpp

@@ -12,154 +12,122 @@
 #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)
     : QMainWindow(parent) {
-    assert(MainWindow::m_instance == nullptr);
+  assert(MainWindow::m_instance == nullptr);
-    MainWindow::m_instance = this;
+  MainWindow::m_instance = this;
-    setupSettings();
+  setupSettings();
-    m_settings->setValue("useNotifySend", useNotifySend);
+  m_settings->setValue("useNotifySend", useNotifySend);
-    m_centralWidget = new CentralWidget(this);
+  m_centralWidget = new CentralWidget(this);
-    setCentralWidget(m_centralWidget);
+  setCentralWidget(m_centralWidget);
-
+  setupTrayIcon();
-    // Create and install the network interceptor
+  setMinimumSize(800, 300);
-    NetworkInterceptor* networkInterceptor = new NetworkInterceptor(this);
+  if (m_settings->contains("geometry")) {
-    QWebEngineProfile::defaultProfile()->setRequestInterceptor(networkInterceptor);
+    restoreGeometry(m_settings->value("geometry").toByteArray());
-
+  } else {
-    setupTrayIcon();
+    resize(1000, 700);
-    setMinimumSize(800, 300);
+    showMaximized();
-    connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this),
+  }
-            &QShortcut::activated, this, &MainWindow::toggleOrCloseWindow);
+  if (m_settings->value("trayIcon", false).toBool() &&
-    if (m_settings->contains("geometry")) {
+      m_settings->value("startHidden", false).toBool()) {
-        restoreGeometry(m_settings->value("geometry").toByteArray());
+    hide();
-    } else {
+    QTimer::singleShot(0, [=]() { hide(); });
-        resize(1000, 700);
+  }
-        showMaximized();
-    }
-    if (m_settings->value("trayIcon", false).toBool() &&
-            m_settings->value("startHidden", false).toBool()) {
-        hide();
-        QTimer::singleShot(0, [=]() { hide(); });
-    }
 }
 
 void MainWindow::fullScreenRequested(
-        QWebEngineFullScreenRequest fullScreenRequest) {
+    QWebEngineFullScreenRequest fullScreenRequest) {
-    fullScreenRequest.accept();
+  fullScreenRequest.accept();
-    if (fullScreenRequest.toggleOn()) {
+  if (fullScreenRequest.toggleOn()) {
-        m_wasMaximized = isMaximized();
+    m_wasMaximized = isMaximized();
-        if (!m_wasMaximized) {
+    showFullScreen();
-            showNormal();
+  } else {
-        }
+    m_wasMaximized ? showMaximized() : showNormal();
-        showFullScreen();
+  }
-    } else {
-        m_wasMaximized ? showMaximized() : showNormal();
-    }
 }
 
 void MainWindow::setupTrayIcon() {
-    if (m_settings->value("trayIcon", false).toBool() == false ||
+  if (m_settings->value("trayIcon", false).toBool() == false ||
-            m_trayIcon != nullptr)
+      m_trayIcon != nullptr)
-        return;
+    return;
 
-    auto aboutAction = new QAction(
+  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->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-    aboutAction->setEnabled(false);
+  aboutAction->setEnabled(false);
 
-    auto exitAction = new QAction("Exit", this);
+  auto exitAction = new QAction("Exit", this);
-    connect(exitAction, &QAction::triggered, []() { QApplication::quit(); });
+  connect(exitAction, &QAction::triggered, []() { QApplication::quit(); });
 
-    m_trayIconMenu = new QMenu(this);
+  m_trayIconMenu = new QMenu(this);
-    m_trayIconMenu->addAction(aboutAction);
+  m_trayIconMenu->addAction(aboutAction);
-    m_trayIconMenu->addAction(exitAction);
+  m_trayIconMenu->addAction(exitAction);
 
-    m_trayIcon = new QSystemTrayIcon(this);
+  m_trayIcon = new QSystemTrayIcon(this);
-    m_trayIcon->setContextMenu(m_trayIconMenu);
+  m_trayIcon->setContextMenu(m_trayIconMenu);
-    m_trayIcon->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
+  m_trayIcon->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-    m_trayIcon->show();
+  m_trayIcon->show();
 
-    connect(m_trayIcon, &QSystemTrayIcon::activated, [this](auto reason) {
+  connect(m_trayIcon, &QSystemTrayIcon::activated, [this](auto reason) {
-        if (reason == QSystemTrayIcon::Trigger) {
+    if (reason == QSystemTrayIcon::Trigger) {
-            toggleOrCloseWindow();
+      if (isVisible()) {
-        }
+        hide();
-    });
+      } else {
+        show();
+        activateWindow();
+      }
+    }
+  });
 }
 
 void MainWindow::cleanTrayIcon() {
-    if (m_trayIcon == nullptr)
+  if (m_trayIcon == nullptr)
-        return;
+    return;
-    m_trayIcon->hide();
+  m_trayIcon->hide();
-    m_trayIconMenu->deleteLater();
+  m_trayIconMenu->deleteLater();
-    m_trayIcon->deleteLater();
+  m_trayIcon->deleteLater();
-    m_trayIconMenu = nullptr;
+  m_trayIconMenu = nullptr;
-    m_trayIcon = nullptr;
+  m_trayIcon = nullptr;
 }
 
 void MainWindow::setupSettings() {
-    m_settings =
+  m_settings =
-            new QSettings("discord-awesomeaudio", "discord-awesomeaudio", this);
+      new QSettings("discord-screenaudio", "discord-screenaudio", this);
-    m_settings->beginGroup("settings");
+  m_settings->beginGroup("settings");
-    m_settings->endGroup();
+  m_settings->endGroup();
 }
 
 QSettings *MainWindow::settings() const { return m_settings; }
 
 void MainWindow::setTrayIcon(bool enabled) {
-    m_settings->setValue("trayIcon", enabled);
+  m_settings->setValue("trayIcon", enabled);
-    if (enabled) {
+  if (enabled) {
-        setupTrayIcon();
+    setupTrayIcon();
-    } else {
+  } else {
-        cleanTrayIcon();
+    cleanTrayIcon();
-    }
+  }
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) {
-    if (m_settings->value("trayIcon", false).toBool()) {
+  if (m_settings->value("trayIcon", false).toBool()) {
-        hide();
+    hide();
-    } else {
+  } else {
-        m_settings->setValue("geometry", saveGeometry());
+    m_settings->setValue("geometry", saveGeometry());
-        QApplication::quit();
+    QApplication::quit();
-    }
+  }
 }
 
 MainWindow *MainWindow::instance() { return m_instance; }
 
 CentralWidget *MainWindow::centralWidget() {
-    return instance()->m_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,31 +10,30 @@
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
 #include <QVector>
-#include <QWebEngineUrlRequestInterceptor>
 
 class MainWindow : public QMainWindow {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
+  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
-    static MainWindow *instance();
+  static MainWindow *instance();
-    QSettings *settings() const;
+  QSettings *settings() const;
-    static CentralWidget *centralWidget();
+  static CentralWidget *centralWidget();
 
 private:
-    void setupTrayIcon();
+  void setupTrayIcon();
-    void cleanTrayIcon();
+  void cleanTrayIcon();
-    void setupSettings();
+  void setupSettings();
-    void closeEvent(QCloseEvent *event) override;
+  QWebEngineProfile *prepareProfile();
-    QSystemTrayIcon *m_trayIcon = nullptr;
+  void closeEvent(QCloseEvent *event) override;
-    QMenu *m_trayIconMenu;
+  QSystemTrayIcon *m_trayIcon = nullptr;
-    QSettings *m_settings;
+  QMenu *m_trayIconMenu;
-    bool m_wasMaximized;
+  QSettings *m_settings;
-    static MainWindow *m_instance;
+  bool m_wasMaximized;
-    CentralWidget *m_centralWidget;
+  static MainWindow *m_instance;
+  CentralWidget *m_centralWidget;
 
 public Q_SLOTS:
-    void setTrayIcon(bool enabled);
+  void setTrayIcon(bool enabled);
-    void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
+  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;
@@ -45,10 +44,6 @@ void UserScript::setupHelpMenu() {
       QString(), "https://github.com/Curve");
   aboutData.addComponent("Rohrkabel", "A C++ RAII Pipewire-API Wrapper", "1.3",
                          "https://github.com/Soundux/rohrkabel");
-  aboutData.addComponent("arRPC",
-                         "An open implementation of Discord's local RPC "
-                         "servers<br>Copyright (c) 2022 OpenAsar",
-                         nullptr, "https://github.com/OpenAsar/arrpc");
   m_helpMenu = new KHelpMenu(MainWindow::instance(), aboutData);
 #endif
 }
@@ -84,7 +79,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 +151,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 +169,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);
 }
@@ -181,68 +178,3 @@ void UserScript::showThemeDialog() {
 void UserScript::installUserStyles(QString url) {
   emit shouldInstallUserStyles(url);
 }
-
-QVariant UserScript::vencordSend(QString event, QVariantList args) {
-  QString configFolder =
-      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>
@@ -24,66 +23,61 @@
 #endif
 
 class UserScript : public QObject {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    UserScript();
+  UserScript();
-    bool isVirtmicRunning();
+  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;
+  QProcess m_virtmicProcess;
-    StreamDialog *m_streamDialog;
+  StreamDialog *m_streamDialog;
-    bool m_kxmlgui = false;
+  bool m_kxmlgui = false;
-    bool m_kglobalaccel = false;
+  bool m_kglobalaccel = false;
-    QString m_userstyles;
+  QString m_userstyles;
-    QString m_loadingMessage;
+  QString m_loadingMessage;
-
-    QString m_vencordSettings;
-
-    void setupHelpMenu();
-    void setupShortcutsDialog();
-    void setupStreamDialog();
-    void setupVirtmic();
-
 #ifdef KXMLGUI
-    KHelpMenu *m_helpMenu;
+  KHelpMenu *m_helpMenu;
 #ifdef KGLOBALACCEL
-    KActionCollection *m_actionCollection;
+  KActionCollection *m_actionCollection;
-    KShortcutsDialog *m_shortcutsDialog;
+  KShortcutsDialog *m_shortcutsDialog;
 #endif
-
 #endif
+  void setupHelpMenu();
+  void setupShortcutsDialog();
+  void setupStreamDialog();
+  void setupVirtmic();
 
 Q_SIGNALS:
-    void muteToggled();
+  void muteToggled();
-    void deafenToggled();
+  void deafenToggled();
-    void streamStarted(bool video, int width, int height, int frameRate);
+  void streamStarted(bool video, int width, int height, int frameRate);
-    void userstylesChanged();
+  void userstylesChanged();
-    void loadingMessageChanged(QString message);
+  void loadingMessageChanged(QString message);
-    void shouldInstallUserStyles(QString url);
+  void shouldInstallUserStyles(QString url);
 
 public Q_SLOTS:
-    void log(QString message);
+  void log(QString message);
-    QString version();
+  QString version();
-    QVariant getPref(QString name, QVariant fallback);
+  QVariant getPref(QString name, QVariant fallback);
-    bool getBoolPref(QString name, bool fallback);
+  bool getBoolPref(QString name, bool fallback);
-    void setPref(QString name, QVariant value);
+  void setPref(QString name, QVariant value);
-    void setTrayIcon(bool value);
+  void setTrayIcon(bool value);
-    void showShortcutsDialog();
+  void showShortcutsDialog();
-    void showHelpMenu();
+  void showHelpMenu();
-    void showStreamDialog();
+  void showStreamDialog();
-    void stopVirtmic();
+  void stopVirtmic();
-    void startVirtmic(QString target);
+  void startVirtmic(QString target);
-    void showThemeDialog();
+  void showThemeDialog();
-    void installUserStyles(QString url);
+  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,26 +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) {
-  if (props.count("media.class") &&
-      props.at("media.class") == "Stream/Output/Audio") {
-    if (props.count("application.name") && props.at("application.name") != "")
-      return props.at("application.name");
-    else if (props.count("application.process.binary") &&
-             props.at("application.process.binary") != "")
-      return props.at("application.process.binary");
-    else
-      return props.at("node.name");
-  } else
-    return nullstr;
-}
-
-QString qGetTarget(const pipewire::spa::dict &props) {
-  return QString::fromStdString(getTarget(props));
-}
 
 QVector<QString> getTargets() {
   auto main_loop = pipewire::main_loop();
@@ -41,7 +22,14 @@ QVector<QString> getTargets() {
         if (global.type == pipewire::node::type) {
           auto node = reg.bind<pipewire::node>(global.id);
           auto info = node.info();
-          QString name = qGetTarget(info.props);
+          QString name;
+          if (info.props.count("application.name") &&
+              info.props["application.name"] != "")
+            name = QString::fromStdString(info.props["application.name"]);
+          else
+            name = QString::fromStdString(
+                info.props["application.process.binary"]);
+
           if (name != "" && !EXCLUDE_TARGETS.contains(name) &&
               !targets.contains(name)) {
             targets.append(name);
@@ -85,12 +73,12 @@ void start(QString _target) {
         continue;
 
       auto &parent = nodes.at(parent_id);
-      std::string name = getTarget(parent.props);
+      std::string name;
-      if (EXCLUDE_TARGETS.contains(QString::fromStdString(name)))
+      if (parent.props.count("application.name") &&
-        continue;
+          parent.props["application.name"] != "")
-
+        name = parent.props["application.name"];
-      if (parent.props.count("media.class") && (parent.props.at("media.class") == "Audio/Source" || parent.props.at("media.class") == "Audio/Source/Virtual"))
+      else
-        continue;
+        name = parent.props["application.process.binary"];
 
       if (name == target ||
           (target == "[All Desktop Audio]" &&
@@ -111,10 +99,10 @@ void start(QString _target) {
     }
   };
 
-  std::string target = _target.toUtf8().toStdString();
+  std::string target = _target.toLatin1().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"},
@@ -135,8 +123,13 @@ void start(QString _target) {
         if (global.type == pipewire::node::type) {
           auto node = reg.bind<pipewire::node>(global.id);
           auto info = node.info();
-          std::string name = getTarget(info.props);
+          std::string name;
-          if (name == nullstr)
+          if (info.props.count("application.name") &&
+              info.props["application.name"] != "")
+            name = info.props["application.name"];
+          else if (info.props.count("application.process.binary")) {
+            name = info.props["application.process.binary"];
+          } else
             return;
           qDebug(virtmicLog) << QString("Added: %1")
                                     .arg(QString::fromStdString(name))
@@ -175,9 +168,12 @@ void start(QString _target) {
       [&](const std::uint32_t id) {
         if (nodes.count(id)) {
           auto info = nodes.at(id);
-          std::string name = getTarget(info.props);
+          std::string name;
-          if (name == nullstr)
+          if (info.props.count("application.name") &&
-            return;
+              info.props["application.name"] != "")
+            name = info.props["application.name"];
+          else
+            name = info.props["application.process.binary"];
           qDebug(virtmicLog) << QString("Removed: %1")
                                     .arg(QString::fromStdString(name))
                                     .toUtf8()

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