Merge tag 'v1.7.0' into vencord

v1.7.0

.gitignore

@@ -1,3 +1,3 @@
 /build
 .vscode
-/submodules/arrpc
+/submodules/Vencord

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "submodules/rohrkabel"]
 	path = submodules/rohrkabel
 	url = https://github.com/Soundux/rohrkabel
-[submodule "submodules/channel"]
-	path = submodules/channel
-	url = https://github.com/Soundux/channel.git

CMakeLists.txt

@@ -44,7 +44,6 @@ set(discord-screenaudio_SRC
   src/streamdialog.cpp
   src/log.cpp
   src/userscript.cpp
-  src/centralwidget.cpp
   resources.qrc
 )
 
@@ -63,20 +62,15 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
   endif()
 endif()
 
-function(add_git_subdirectory SUBMODULE)
-  if(NOT EXISTS "${PROJECT_SOURCE_DIR}/submodules/${SUBMODULE}/CMakeLists.txt")
-    message(FATAL_ERROR "Submodule ${SUBMODULE} was not found since you are not in a Git checkout or have GIT_SUBMODULE disabled. Please provide ${SUBMODULE} manually to `./submodules/${SUBMODULE}`.")
-  endif()
+if(NOT EXISTS "${PROJECT_SOURCE_DIR}/submodules/rohrkabel/CMakeLists.txt")
+  message(FATAL_ERROR "Rohrkabel was not found since you are not in a Git checkout or have GIT_SUBMODULE disabled. Please provide rohrkabel manually to `./submodules/rohrkabel`.")
+endif()
 
-  add_subdirectory(submodules/${SUBMODULE})
-endfunction()
-
-add_git_subdirectory(rohrkabel)
-add_git_subdirectory(channel)
+add_subdirectory(submodules/rohrkabel)
 
 add_executable(discord-screenaudio ${discord-screenaudio_SRC})
 
-target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel channel)
+target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel)
 
 if(KF5Notifications_FOUND)
   target_link_libraries(discord-screenaudio KF5::Notifications)

README.md

@@ -9,7 +9,7 @@ of [@edisionnano](https://github.com/edisionnano) and the
 
 Unlike a lot of other solutions, the audio here is directly fed into the
 screenshare and not passed to the user microphone
-([see explanation](#how-does-this-work)).
+([see explanation](#how-it-works)).
 
 ![Screenshot_20221211_185028](https://user-images.githubusercontent.com/48161361/206920213-58a8091a-d8f9-4bb7-ae3d-3f8581b84d24.png)
 
@@ -106,11 +106,9 @@ allowing access to "All system files" under the "Filesystem" section.
 ### Is there any way to add custom CSS / a theme?
 
 Yes, you can add all your styles into
-`~/.config/discord-screenaudio/userstyles.css` (or
-`~/.var/app/de.shorsh.discord-screenaudio/config/discord-screenaudio/userstyles.css`
-if you are using the Flatpak). But please note that due to QtWebEngine
-limitations concerning content security policies, you can't use any external
-files (like `@import` or `url()`).
+`~/.config/discord-screenaudio/userstyles.css`. But please note that due to
+QtWebEngine limitations concerning content security policies, you can't use any
+external files (like `@import` or `url()`).
 
 ## License
 

assets/arrpc_bridge_mod.js

@@ -1 +0,0 @@
-setTimeout((i=>{let t,a,s,e={};new WebSocket("ws://127.0.0.1:1337").onmessage=async i=>{if(msg=JSON.parse(i.data),console.log(msg),!t){const i=window.webpackChunkdiscord_app.push([[Symbol()],{},i=>i]),e=i.c;window.webpackChunkdiscord_app.pop();for(const i in e){let a=e[i].exports;if(a=a&&(a.Z??a.ZP),a&&a.register&&a.wait){t=a;break}}const n=i.m;for(const t in n)if(n[t].toString().includes("getAssetImage: size must === [number, number] for Twitch")){const s=i(t),e=Object.values(s).find((i=>"function"==typeof i&&i.toString().includes("apply(")));a=async(i,t)=>(await e(i,[t,void 0]))[0];break}for(const t in n)if(n[t].toString().includes("e.application={")){const a=i(t),e=Object.values(a).find((i=>"function"==typeof i&&i.toString().includes("e.application={")));s=async i=>{let t={};return await e(t,i),t.application};break}}if(msg.activity?.assets?.large_image&&(msg.activity.assets.large_image=await a(msg.activity.application_id,msg.activity.assets.large_image)),msg.activity?.assets?.small_image&&(msg.activity.assets.small_image=await a(msg.activity.application_id,msg.activity.assets.small_image)),msg.activity){const i=msg.activity.application_id;e[i]||(e[i]=await s(i));const t=e[i];msg.activity.name||(msg.activity.name=t.name)}t.dispatch({type:"LOCAL_ACTIVITY_UPDATE",...msg})}}),1e4);

assets/userscript.js

@@ -139,12 +139,10 @@ setTimeout(() => {
 
 function main() {
   userscript.muteToggled.connect(() => {
-    console.log("Toggling mute");
     muteBtn && muteBtn.click();
   });
 
   userscript.deafenToggled.connect(() => {
-    console.log("Toggling deafen");
     deafenBtn && deafenBtn.click();
   });
 
@@ -159,25 +157,6 @@ function main() {
     streamStartBtnClone.remove();
   });
 
-  function updateUserstyles() {
-    userscript.log("Loading userstyles...");
-    userscript.loadingMessage = "Loading userstyles...";
-    let stylesheet = document.getElementById("discordScreenaudioUserstyles");
-    if (stylesheet) {
-      userscript.log("Removing old userstyles...");
-      stylesheet.remove();
-    }
-    stylesheet = document.createElement("style");
-    stylesheet.id = "discordScreenaudioUserstyles";
-    stylesheet.innerText = userscript.userstyles;
-    document.head.appendChild(stylesheet);
-    userscript.log("Finished loading userstyles");
-    userscript.loadingMessage = "";
-  }
-
-  userscript.userstylesChanged.connect(updateUserstyles);
-  setTimeout(() => updateUserstyles());
-
   setInterval(async () => {
     const streamActive =
       document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
@@ -287,11 +266,15 @@ function main() {
     }
 
     muteBtn = buttonContainer
-      ? buttonContainer.getElementsByTagName("button")[0]
+      ? buttonContainer.getElementsByClassName(
+          "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+        )[0]
       : null;
 
     deafenBtn = buttonContainer
-      ? buttonContainer.getElementsByTagName("button")[1]
+      ? buttonContainer.getElementsByClassName(
+          "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+        )[1]
       : null;
 
     if (resolutionString) {
@@ -328,18 +311,6 @@ function main() {
             })
           );
 
-          // section.appendChild(
-          //   createButton("Install Theme", () => {
-          //     userscript.showThemeDialog();
-          //   })
-          // );
-
-          // section.appendChild(
-          //   createButton("Uninstall Theme", () => {
-          //     userscript.installUserStyles("");
-          //   })
-          // );
-
           section.appendChild(
             createSwitch(
               "Move discord-screenaudio to the system tray instead of closing",

assets/vencord/VencordNativeStub.ts

@@ -0,0 +1,43 @@
+let webclass;
+
+const promise = new Promise((resolve) => {
+  setTimeout(() => {
+    new QWebChannel(qt.webChannelTransport, function (channel) {
+      webclass = channel.objects.webclass;
+      resolve();
+    });
+  });
+});
+
+async function prepareWebclass() {
+  if (!webclass) await promise;
+}
+
+window.VencordNative = {
+  getVersions: () => ({}),
+  ipc: {
+    send: async (event: string, ...args: any[]) => {
+      await prepareWebclass();
+      webclass.vencordSend(event, args);
+    },
+    sendSync: (event: string, ...args: any[]) => {
+      // We need this hack because Vencord requires its settings right when it starts
+      if (event === "VencordGetSettings") {
+        return window.discordScreenaudioVencordSettings || "{}";
+      } else throw new Error("Synchroneous IPC not implemented");
+    },
+    on(event: string, listener: () => {}) {
+      // TODO quickCss
+    },
+    off(event: string, listener: () => {}) {
+      // not used for now
+    },
+    invoke: async (event: string, ...args: any[]) => {
+      await prepareWebclass();
+      if (event === "VencordSetSettings") {
+        window.discordScreenaudioVencordSettings = args[0];
+      }
+      return webclass.vencordSend(event, args);
+    },
+  },
+};

assets/vencord/plugin.js

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

assets/vencord/settings.patch

@@ -0,0 +1,15 @@
+--- 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>

resources.qrc

@@ -2,8 +2,7 @@
 <RCC>
   <qresource>
     <file>assets/userscript.js</file>
-    <file>assets/arrpc_bridge_mod.js</file>
-    <file>assets/arrpc.js</file>
+    <file>assets/vencord/vencord.js</file>
     <file>assets/de.shorsh.discord-screenaudio.png</file>
   </qresource>
 </RCC>

scripts/build_arrpc.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-cd "$(dirname "$0")/../submodules"
-
-echo_status() {
-  echo
-  echo
-  echo "-> $1..."
-}
-
-if [ ! -d "arrpc" ]; then
-  echo_status "Cloning arRPC"
-  git clone https://github.com/OpenAsar/arrpc.git
-  cd arrpc
-else
-  echo_status "Fetching arRPC changes"
-  cd arrpc
-  git fetch
-fi
-
-echo_status "Checking out latest commit"
-git reset --hard HEAD
-git checkout main
-
-echo_status "Installing dependencies"
-pnpm i -D @vercel/ncc
-
-echo_status "Patching arRPC"
-sed -i 's/"type": "module",//' package.json
-
-echo_status "Building arRPC"
-pnpm exec ncc build -m src/index.js
-
-echo_status "Copying built file"
-cp -v ./dist/index.js ../../assets/arrpc.js

scripts/build_vencord.sh

@@ -0,0 +1,39 @@
+#!/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

@@ -1,84 +0,0 @@
-#include "centralwidget.h"
-#include "discordpage.h"
-#include "mainwindow.h"
-
-#include <QWebEngineNotification>
-#include <QWebEngineProfile>
-#include <QWebEngineScript>
-#include <QWebEngineScriptCollection>
-#include <QWebEngineSettings>
-
-CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) {
-  setStyleSheet("background-color:#313338;");
-  m_layout = new QVBoxLayout(this);
-  m_layout->setMargin(0);
-  m_layout->setSpacing(0);
-  setupWebView();
-}
-
-void CentralWidget::setupWebView() {
-  auto page = new DiscordPage(this);
-
-  m_webView = new QWebEngineView(this);
-  m_webView->setPage(page);
-
-  bool useNotifySend = MainWindow::instance()
-                           ->settings()
-                           ->value("useNotifySend", false)
-                           .toBool();
-  if (m_useKF5Notifications || useNotifySend)
-    QWebEngineProfile::defaultProfile()->setNotificationPresenter(
-        [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
-          if (useNotifySend) {
-            auto title = notificationInfo->title();
-            auto message = notificationInfo->message();
-            auto image_path =
-                QString("/tmp/discord-screenaudio-%1.png").arg(title);
-            notificationInfo->icon().save(image_path);
-            QProcess::execute("notify-send",
-                              {"--icon", image_path, "--app-name",
-                               "discord-screenaudio", title, message});
-          } else if (m_useKF5Notifications) {
-#ifdef KNOTIFICATIONS
-            KNotification *notification =
-                new KNotification("discordNotification");
-            notification->setTitle(notificationInfo->title());
-            notification->setText(notificationInfo->message());
-            notification->setPixmap(
-                QPixmap::fromImage(notificationInfo->icon()));
-            notification->setDefaultAction("View");
-            connect(notification, &KNotification::defaultActivated,
-                    [&, notificationInfo = std::move(notificationInfo)]() {
-                      notificationInfo->click();
-                      show();
-                      activateWindow();
-                    });
-            notification->sendEvent();
-#endif
-          }
-        });
-
-  connect(page->userScript(), &UserScript::loadingMessageChanged, this,
-          &CentralWidget::setLoadingIndicator);
-
-  m_layout->addWidget(m_webView);
-}
-
-void CentralWidget::setLoadingIndicator(QString text) {
-  if (text != "") {
-    if (m_loadingLabel == nullptr) {
-      m_loadingLabel = new QLabel(this);
-      m_loadingLabel->setMaximumHeight(20);
-      m_loadingLabel->setAlignment(Qt::AlignHCenter);
-      m_loadingLabel->setStyleSheet("color:#dedede;");
-      m_layout->addWidget(m_loadingLabel);
-    }
-    m_loadingLabel->setText(text.mid(0, 100));
-  } else {
-    if (m_loadingLabel != nullptr) {
-      m_layout->removeWidget(m_loadingLabel);
-      m_loadingLabel->deleteLater();
-      m_loadingLabel = nullptr;
-    }
-  }
-}

src/centralwidget.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QWebEnginePage>
-#include <QWebEngineProfile>
-#include <QWebEngineView>
-#include <QWidget>
-
-class CentralWidget : public QWidget {
-  Q_OBJECT
-
-public:
-  CentralWidget(QWidget *parent = nullptr);
-
-private:
-  void setupWebView();
-  QVBoxLayout *m_layout;
-  QWebEngineView *m_webView;
-#ifdef KNOTIFICATIONS
-  bool m_useKF5Notifications = true;
-#else
-  bool m_useKF5Notifications = false;
-#endif
-  QLabel *m_loadingLabel = nullptr;
-
-public Q_SLOTS:
-  void setLoadingIndicator(QString text);
-};

src/discordpage.cpp

@@ -9,7 +9,6 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QNetworkReply>
-#include <QTemporaryFile>
 #include <QTimer>
 #include <QWebChannel>
 #include <QWebEngineScript>
@@ -17,12 +16,10 @@
 #include <QWebEngineSettings>
 
 DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
-  setBackgroundColor(QColor("#313338"));
+  setBackgroundColor(QColor("#202225"));
 
   connect(this, &QWebEnginePage::featurePermissionRequested, this,
           &DiscordPage::featurePermissionRequested);
-  connect(this, &DiscordPage::fullScreenRequested, MainWindow::instance(),
-          &MainWindow::fullScreenRequested);
 
   setupPermissions();
 
@@ -37,8 +34,20 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
   injectFile(&DiscordPage::injectScript, "userscript.js",
              ":/assets/userscript.js");
 
+  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();
 }
 
 void DiscordPage::setupPermissions() {
@@ -56,79 +65,13 @@ void DiscordPage::setupPermissions() {
 }
 
 void DiscordPage::setupUserStyles() {
-  qDebug(userstylesLog).noquote()
-      << "Looking for userstyles in" << m_configLocation.absolutePath();
-  m_userStylesFile =
-      new QFile(m_configLocation.absoluteFilePath("userstyles.css"));
-  if (m_userStylesFile->exists()) {
-    qDebug(userstylesLog).noquote()
-        << "Found userstyles:" << m_userStylesFile->fileName();
-    m_userStylesFile->open(QIODevice::ReadOnly);
-    m_userStylesContent = m_userStylesFile->readAll();
-    m_userStylesFile->close();
-    fetchUserStyles();
+  QString file =
+      QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) +
+      "/userstyles.css";
+  if (QFileInfo(file).exists()) {
+    qDebug(mainLog) << "Found userstyles:" << file;
+    injectFile(&DiscordPage::injectStylesheet, "userstyles.js", file);
   }
-  connect(&m_userScript, &UserScript::shouldInstallUserStyles, this,
-          &DiscordPage::getUserStyles);
-}
-
-const QRegularExpression importRegex(
-    R"r(@import (?:url\(|)['"]{0,1}(?!.*usrbgs?\.css)([^'"]+?)['"]{0,1}(?:|\));)r");
-const QRegularExpression urlRegex(
-    R"r(url\(['"]{0,1}((?!https:\/\/fonts.gstatic.com)(?!data:)(?!.*\.woff2)(?!.*\.ttf)[^'"]+?)['"]{0,1}\))r");
-
-void DiscordPage::fetchUserStyles() {
-  m_userScript.setProperty(
-      "loadingMessage", "Loading userstyles: Fetching additional resources...");
-  bool foundImport = true;
-  auto match = importRegex.match(m_userStylesContent);
-  if (!match.hasMatch()) {
-    foundImport = false;
-    match = urlRegex.match(m_userStylesContent);
-  }
-  if (match.hasMatch()) {
-    auto url = match.captured(1);
-    qDebug(userstylesLog) << "Fetching" << url;
-    m_userScript.setProperty(
-        "loadingMessage",
-        QString("Loading userstyles: Fetching %1...").arg(url));
-    QNetworkRequest request(url);
-    auto reply = m_networkAccessManager.get(request);
-    connect(reply, &QNetworkReply::finished, [=]() {
-      QByteArray content = "";
-      if (reply->error() == QNetworkReply::NoError) {
-        if (!reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
-                 .isNull())
-          content =
-              reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
-                  .toByteArray();
-        else
-          content = reply->readAll();
-      } else
-        qDebug(userstylesLog) << reply->errorString().toUtf8().constData();
-      reply->deleteLater();
-      m_userStylesContent = m_userStylesContent.replace(
-          match.captured(0), foundImport
-                                 ? content
-                                 : "url(data:application/octet-stream;base64," +
-                                       content.toBase64() + ")");
-      fetchUserStyles();
-    });
-    return;
-  }
-  qDebug(userstylesLog) << "Injecting userstyles";
-  m_userScript.setProperty("userstyles", m_userStylesContent);
-  m_userScript.setProperty("loadingMessage", "");
-  if (!m_configLocation.exists())
-    m_configLocation.mkpath(".");
-  m_userStylesFile->open(QIODevice::WriteOnly);
-  m_userStylesFile->write(m_userStylesContent.toUtf8());
-  m_userStylesFile->close();
-}
-
-void DiscordPage::getUserStyles(QString url) {
-  m_userStylesContent = url == "" ? "" : QString("@import url(%1);").arg(url);
-  fetchUserStyles();
 }
 
 void DiscordPage::injectScript(
@@ -153,6 +96,7 @@ void DiscordPage::injectScript(QString name, QString content) {
 
 void DiscordPage::injectStylesheet(QString name, QString content) {
   auto script = QString(R"(const stylesheet = document.createElement("style");
+stylesheet.type = "text/css";
 stylesheet.id = "%1";
 stylesheet.innerText = `%2`;
 document.head.appendChild(stylesheet);
@@ -261,15 +205,11 @@ void DiscordPage::javaScriptConsoleMessage(
     QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
     int lineNumber, const QString &sourceID) {
   auto colorSegments = message.split("%c");
-  if (colorSegments[0] != "") {
-    for (auto line : colorSegments[0].split("\n"))
-      qDebug(discordLog) << line.toUtf8().constData();
-  }
   for (auto segment : colorSegments.mid(1)) {
     auto lines = segment.split("\n");
     QString ansi;
     uint endOfStyles = lines.length();
-    for (auto line = 1; line < lines.length(); line++) {
+    for (size_t line = 1; line < lines.length(); line++) {
       if (!lines[line].endsWith(";")) {
         endOfStyles = line;
         break;
@@ -283,7 +223,9 @@ void DiscordPage::javaScriptConsoleMessage(
       }
     }
     qDebug(discordLog) << (ansi + lines[0].trimmed() + "\033[0m " +
-                           lines[endOfStyles].trimmed())
+                           ((lines.length() > endOfStyles)
+                                ? lines[endOfStyles].trimmed()
+                                : ""))
                               .toUtf8()
                               .constData();
     for (auto line : lines.mid(endOfStyles + 1)) {
@@ -291,21 +233,3 @@ void DiscordPage::javaScriptConsoleMessage(
     }
   }
 }
-
-UserScript *DiscordPage::userScript() { return &m_userScript; }
-
-void DiscordPage::setupArrpc() {
-  QFile nodejs("/usr/bin/node");
-  if (nodejs.exists()) {
-    auto arrpcSource = QTemporaryFile::createNativeFile(":/assets/arrpc.js");
-    qDebug(mainLog).noquote()
-        << "NodeJS found, starting arRPC located at" << arrpcSource->fileName();
-    m_arrpcProcess.setProcessChannelMode(QProcess::ForwardedChannels);
-    m_arrpcProcess.setProgram(nodejs.fileName());
-    m_arrpcProcess.setArguments(QStringList{arrpcSource->fileName()});
-    m_arrpcProcess.start();
-
-    injectFile(&DiscordPage::injectScript, "arrpc_bridge_mod.js",
-               ":/assets/arrpc_bridge_mod.js");
-  }
-}

src/discordpage.h

@@ -1,12 +1,9 @@
 #pragma once
 
+#include "streamdialog.h"
 #include "userscript.h"
+#include "virtmic.h"
 
-#include <QDir>
-#include <QFile>
-#include <QNetworkAccessManager>
-#include <QProcess>
-#include <QStandardPaths>
 #include <QWebEngineFullScreenRequest>
 #include <QWebEnginePage>
 #include <QWebEngineScript>
@@ -16,20 +13,11 @@ class DiscordPage : public QWebEnginePage {
 
 public:
   explicit DiscordPage(QWidget *parent = nullptr);
-  UserScript *userScript();
 
 private:
   UserScript m_userScript;
-  QFile *m_userStylesFile;
-  QString m_userStylesContent;
-  QNetworkAccessManager m_networkAccessManager;
-  QProcess m_arrpcProcess;
-  const QDir m_configLocation =
-      QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
   void setupPermissions();
   void setupUserStyles();
-  void setupArrpc();
-  void fetchUserStyles();
   bool acceptNavigationRequest(const QUrl &url,
                                QWebEnginePage::NavigationType type,
                                bool isMainFrame) override;
@@ -48,9 +36,6 @@ private:
 private Q_SLOTS:
   void featurePermissionRequested(const QUrl &securityOrigin,
                                   QWebEnginePage::Feature feature);
-
-public Q_SLOTS:
-  void getUserStyles(QString url);
 };
 
 // Will immediately get destroyed again but is needed for navigation to

src/log.cpp

@@ -5,4 +5,3 @@ Q_LOGGING_CATEGORY(discordLog, "discord");
 Q_LOGGING_CATEGORY(userscriptLog, "userscript");
 Q_LOGGING_CATEGORY(virtmicLog, "virtmic");
 Q_LOGGING_CATEGORY(shortcutLog, "shortcut");
-Q_LOGGING_CATEGORY(userstylesLog, "userstyles");

src/log.h

@@ -7,4 +7,3 @@ Q_DECLARE_LOGGING_CATEGORY(discordLog);
 Q_DECLARE_LOGGING_CATEGORY(userscriptLog);
 Q_DECLARE_LOGGING_CATEGORY(virtmicLog);
 Q_DECLARE_LOGGING_CATEGORY(shortcutLog);
-Q_DECLARE_LOGGING_CATEGORY(userstylesLog);

src/main.cpp

@@ -24,6 +24,9 @@ int main(int argc, char *argv[]) {
       "Custom Discord client with the ability to stream audio on Linux");
   parser.addHelpOption();
   parser.addVersionOption();
+  QCommandLineOption virtmicOption("virtmic", "Start the Virtual Microphone",
+                                   "target");
+  parser.addOption(virtmicOption);
   QCommandLineOption degubOption("remote-debugging",
                                  "Open Chromium Remote Debugging on port 9222");
   parser.addOption(degubOption);
@@ -33,6 +36,10 @@ int main(int argc, char *argv[]) {
 
   parser.process(app);
 
+  if (parser.isSet(virtmicOption)) {
+    Virtmic::start(parser.value(virtmicOption));
+  }
+
   qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
           "--enable-features=WebRTCPipeWireCapturer " +
               qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));

src/mainwindow.cpp

@@ -16,7 +16,11 @@
 #include <QThread>
 #include <QTimer>
 #include <QUrl>
-#include <QWebEngineFullScreenRequest>
+#include <QWebEngineNotification>
+#include <QWebEngineProfile>
+#include <QWebEngineScript>
+#include <QWebEngineScriptCollection>
+#include <QWebEngineSettings>
 #include <QWidget>
 
 MainWindow *MainWindow::m_instance = nullptr;
@@ -25,17 +29,12 @@ MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
     : QMainWindow(parent) {
   assert(MainWindow::m_instance == nullptr);
   MainWindow::m_instance = this;
+  m_useNotifySend = useNotifySend;
   setupSettings();
-  m_settings->setValue("useNotifySend", useNotifySend);
-  m_centralWidget = new CentralWidget(this);
-  setCentralWidget(m_centralWidget);
+  setupWebView();
   setupTrayIcon();
-  if (m_settings->contains("geometry")) {
-    restoreGeometry(m_settings->value("geometry").toByteArray());
-  } else {
-    resize(1000, 700);
-    showMaximized();
-  }
+  resize(1000, 700);
+  showMaximized();
   if (m_settings->value("trayIcon", false).toBool() &&
       m_settings->value("startHidden", false).toBool()) {
     hide();
@@ -43,6 +42,49 @@ MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
   }
 }
 
+void MainWindow::setupWebView() {
+  auto page = new DiscordPage(this);
+  connect(page, &QWebEnginePage::fullScreenRequested, this,
+          &MainWindow::fullScreenRequested);
+
+  m_webView = new QWebEngineView(this);
+  m_webView->setPage(page);
+
+  if (m_useKF5Notifications || m_useNotifySend)
+    QWebEngineProfile::defaultProfile()->setNotificationPresenter(
+        [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
+          if (m_useNotifySend) {
+            auto title = notificationInfo->title();
+            auto message = notificationInfo->message();
+            auto image_path =
+                QString("/tmp/discord-screenaudio-%1.png").arg(title);
+            notificationInfo->icon().save(image_path);
+            QProcess::execute("notify-send",
+                              {"--icon", image_path, "--app-name",
+                               "discord-screenaudio", title, message});
+          } else if (m_useKF5Notifications) {
+#ifdef KNOTIFICATIONS
+            KNotification *notification =
+                new KNotification("discordNotification");
+            notification->setTitle(notificationInfo->title());
+            notification->setText(notificationInfo->message());
+            notification->setPixmap(
+                QPixmap::fromImage(notificationInfo->icon()));
+            notification->setDefaultAction("View");
+            connect(notification, &KNotification::defaultActivated,
+                    [&, notificationInfo = std::move(notificationInfo)]() {
+                      notificationInfo->click();
+                      show();
+                      activateWindow();
+                    });
+            notification->sendEvent();
+#endif
+          }
+        });
+
+  setCentralWidget(m_webView);
+}
+
 void MainWindow::fullScreenRequested(
     QWebEngineFullScreenRequest fullScreenRequest) {
   fullScreenRequest.accept();
@@ -99,8 +141,7 @@ void MainWindow::cleanTrayIcon() {
 }
 
 void MainWindow::setupSettings() {
-  m_settings =
-      new QSettings("discord-screenaudio", "discord-screenaudio", this);
+  m_settings = new QSettings("maltejur", "discord-screenaudio", this);
   m_settings->beginGroup("settings");
   m_settings->endGroup();
 }
@@ -119,14 +160,8 @@ void MainWindow::setTrayIcon(bool enabled) {
 void MainWindow::closeEvent(QCloseEvent *event) {
   if (m_settings->value("trayIcon", false).toBool()) {
     hide();
-  } else {
-    m_settings->setValue("geometry", saveGeometry());
+  } else
     QApplication::quit();
-  }
 }
 
 MainWindow *MainWindow::instance() { return m_instance; }
-
-CentralWidget *MainWindow::centralWidget() {
-  return instance()->m_centralWidget;
-};

src/mainwindow.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "centralwidget.h"
-#include "virtmic.h"
+#include "discordpage.h"
 
 #include <QMainWindow>
 #include <QMenu>
@@ -9,8 +8,10 @@
 #include <QSettings>
 #include <QString>
 #include <QSystemTrayIcon>
-#include <QVBoxLayout>
 #include <QVector>
+#include <QWebEnginePage>
+#include <QWebEngineProfile>
+#include <QWebEngineView>
 
 class MainWindow : public QMainWindow {
   Q_OBJECT
@@ -19,22 +20,31 @@ public:
   explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
   static MainWindow *instance();
   QSettings *settings() const;
-  static CentralWidget *centralWidget();
 
 private:
+  void setupWebView();
   void setupTrayIcon();
   void cleanTrayIcon();
   void setupSettings();
+  QWebEngineView *m_webView;
   QWebEngineProfile *prepareProfile();
+  DiscordPage *m_discordPage;
   void closeEvent(QCloseEvent *event) override;
   QSystemTrayIcon *m_trayIcon = nullptr;
   QMenu *m_trayIconMenu;
   QSettings *m_settings;
   bool m_wasMaximized;
   static MainWindow *m_instance;
-  CentralWidget *m_centralWidget;
+  bool m_useNotifySend;
+#ifdef KNOTIFICATIONS
+  bool m_useKF5Notifications = true;
+#else
+  bool m_useKF5Notifications = false;
+#endif
 
 public Q_SLOTS:
   void setTrayIcon(bool enabled);
+
+private Q_SLOTS:
   void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
 };

src/streamdialog.cpp

@@ -1,5 +1,4 @@
 #include "streamdialog.h"
-#include "mainwindow.h"
 #include "virtmic.h"
 
 #include <QComboBox>

src/userscript.cpp

@@ -4,9 +4,9 @@
 
 #include <QApplication>
 #include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
 #include <QFile>
-#include <QInputDialog>
-#include <QMessageBox>
 #include <QStandardPaths>
 #include <QTimer>
 
@@ -42,12 +42,8 @@ void UserScript::setupHelpMenu() {
   aboutData.addCredit(
       "Curve", "For creating the Rohrkabel library used in this project.",
       QString(), "https://github.com/Curve");
-  aboutData.addComponent("Rohrkabel", "A C++ RAII Pipewire-API Wrapper", "1.5",
+  aboutData.addComponent("Rohrkabel", "A C++ RAII Pipewire-API Wrapper", "1.3",
                          "https://github.com/Soundux/rohrkabel");
-  aboutData.addComponent(
-      "Soundux/channel ",
-      "A C++ implementation of Rust's std::sync::mpsc::channel", nullptr,
-      "https://github.com/Soundux/channel");
   m_helpMenu = new KHelpMenu(MainWindow::instance(), aboutData);
 #endif
 }
@@ -66,7 +62,7 @@ void UserScript::setupShortcutsDialog() {
   auto toggleDeafenAction = new QAction(this);
   toggleDeafenAction->setText("Toggle Deafen");
   toggleDeafenAction->setIcon(QIcon::fromTheme("audio-volume-muted"));
-  connect(toggleDeafenAction, &QAction::triggered, this,
+  connect(toggleMuteAction, &QAction::triggered, this,
           &UserScript::deafenToggled);
 
   m_actionCollection = new KActionCollection(this);
@@ -172,13 +168,67 @@ void UserScript::showStreamDialog() {
   m_streamDialog->updateTargets();
 }
 
-void UserScript::showThemeDialog() {
-  auto url = QInputDialog::getText(MainWindow::instance(), "Theme Installation",
-                                   "Please enter the URL of the Theme");
-  if (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";
 
-void UserScript::installUserStyles(QString url) {
-  emit shouldInstallUserStyles(url);
+  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

@@ -18,10 +18,6 @@
 
 #endif
 
-#ifdef KNOTIFICATIONS
-#include <KNotification>
-#endif
-
 class UserScript : public QObject {
   Q_OBJECT
 
@@ -31,17 +27,12 @@ public:
   Q_PROPERTY(QString version READ version CONSTANT);
   Q_PROPERTY(bool kxmlgui MEMBER m_kxmlgui CONSTANT);
   Q_PROPERTY(bool kglobalaccel MEMBER m_kglobalaccel CONSTANT);
-  Q_PROPERTY(QString userstyles MEMBER m_userstyles NOTIFY userstylesChanged);
-  Q_PROPERTY(QString loadingMessage MEMBER m_loadingMessage NOTIFY
-                 loadingMessageChanged);
 
 private:
   QProcess m_virtmicProcess;
   StreamDialog *m_streamDialog;
   bool m_kxmlgui = false;
   bool m_kglobalaccel = false;
-  QString m_userstyles;
-  QString m_loadingMessage;
 #ifdef KXMLGUI
   KHelpMenu *m_helpMenu;
 #ifdef KGLOBALACCEL
@@ -49,6 +40,7 @@ private:
   KShortcutsDialog *m_shortcutsDialog;
 #endif
 #endif
+  QString m_vencordSettings;
   void setupHelpMenu();
   void setupShortcutsDialog();
   void setupStreamDialog();
@@ -58,9 +50,6 @@ Q_SIGNALS:
   void muteToggled();
   void deafenToggled();
   void streamStarted(bool video, int width, int height, int frameRate);
-  void userstylesChanged();
-  void loadingMessageChanged(QString message);
-  void shouldInstallUserStyles(QString url);
 
 public Q_SLOTS:
   void log(QString message);
@@ -74,8 +63,7 @@ public Q_SLOTS:
   void showStreamDialog();
   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,

src/virtmic.cpp

@@ -1,174 +1,196 @@
 #include "virtmic.h"
 #include "log.h"
 
-QThread virtmicThread;
-std::unique_ptr<pipewire::sender<Virtmic::set_target, Virtmic::terminate>>
-    senderr;
-std::unique_ptr<cr::receiver<Virtmic::new_targets>> receiverr;
+#include <rohrkabel/loop/main.hpp>
+#include <rohrkabel/registry/registry.hpp>
 
-void Virtmic::instance() {
-  if (!virtmicThread.isRunning()) {
-    auto [main_sender, main_receiver] = cr::channel<new_targets>();
-    auto [pw_sender, pw_receiver] = pipewire::channel<set_target, terminate>();
-    Virtmic *virtmic =
-        new Virtmic(std::move(pw_receiver), std::move(main_sender));
-    virtmic->moveToThread(&virtmicThread);
-    virtmicThread.start();
-    QMetaObject::invokeMethod(virtmic, "run");
-    receiverr = std::make_unique<cr::receiver<Virtmic::new_targets>>(
-        std::move(main_receiver));
-    senderr = std::make_unique<
-        pipewire::sender<Virtmic::set_target, Virtmic::terminate>>(
-        std::move(pw_sender));
+namespace Virtmic {
+
+const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
+
+QVector<QString> getTargets() {
+  auto main_loop = pipewire::main_loop();
+  auto context = pipewire::context(main_loop);
+  auto core = pipewire::core(context);
+  auto reg = pipewire::registry(core);
+
+  QVector<QString> targets;
+
+  auto reg_listener = reg.listen<pipewire::registry_listener>();
+  reg_listener.on<pipewire::registry_event::global>(
+      [&](const pipewire::global &global) {
+        if (global.type == pipewire::node::type) {
+          auto node = reg.bind<pipewire::node>(global.id);
+          auto info = node.info();
+          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);
+          }
+        }
+      });
+  core.update();
+
+  return targets;
+}
+
+void start(QString _target) {
+  std::map<std::uint32_t, pipewire::port> ports;
+  std::unique_ptr<pipewire::port> virt_fl, virt_fr;
+
+  std::map<std::uint32_t, pipewire::node_info> nodes;
+  std::map<std::uint32_t, pipewire::link_factory> links;
+
+  auto main_loop = pipewire::main_loop();
+  auto context = pipewire::context(main_loop);
+  auto core = pipewire::core(context);
+  auto reg = pipewire::registry(core);
+
+  auto link = [&](const std::string &target, pipewire::core &core) {
+    for (const auto &[port_id, port] : ports) {
+      if (!virt_fl || !virt_fr)
+        continue;
+
+      if (links.count(port_id))
+        continue;
+
+      if (port.info().direction == pipewire::port_direction::input)
+        continue;
+
+      if (!port.info().props.count("node.id"))
+        continue;
+
+      auto parent_id = std::stoul(port.info().props["node.id"]);
+
+      if (!nodes.count(parent_id))
+        continue;
+
+      auto &parent = nodes.at(parent_id);
+      std::string name;
+      if (parent.props.count("application.name") &&
+          parent.props["application.name"] != "")
+        name = parent.props["application.name"];
+      else
+        name = parent.props["application.process.binary"];
+
+      if (name == target ||
+          (target == "[All Desktop Audio]" &&
+           !EXCLUDE_TARGETS.contains(QString::fromStdString(name)))) {
+        auto fl = port.info().props["audio.channel"] == "FL";
+        links.emplace(
+            port_id,
+            core.create<pipewire::link_factory>(
+                {fl ? virt_fl->info().id : virt_fr->info().id, port_id}));
+        qDebug(virtmicLog) << QString("Link: %1:%2 -> %3")
+                                  .arg(QString::fromStdString(name))
+                                  .arg(port_id)
+                                  .arg(fl ? virt_fl->info().id
+                                          : virt_fr->info().id)
+                                  .toUtf8()
+                                  .data();
+      }
+    }
+  };
+
+  std::string target = _target.toLatin1().toStdString();
+
+  auto virtual_mic = core.create("adapter",
+                                 {{"node.name", "discord-screenaudio-virtmic"},
+                                  {"media.class", "Audio/Source/Virtual"},
+                                  {"factory.name", "support.null-audio-sink"},
+                                  {"audio.channels", "2"},
+                                  {"audio.position", "FL,FR"}},
+                                 pipewire::node::type, pipewire::node::version,
+                                 pipewire::update_strategy::none);
+
+  if (target == "[None]") {
+    while (true) {
+      main_loop.run();
+    }
+    return;
   }
-}
 
-void Virtmic::setTarget(QString target) {
-  senderr.get()->send<Virtmic::set_target>({target});
-}
+  auto reg_events = reg.listen<pipewire::registry_listener>();
+  reg_events.on<pipewire::registry_event::global>(
+      [&](const pipewire::global &global) {
+        if (global.type == pipewire::node::type) {
+          auto node = reg.bind<pipewire::node>(global.id);
+          auto info = node.info();
+          std::string name;
+          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))
+                                    .toUtf8()
+                                    .data();
 
-void Virtmic::getTargets() { senderr.get()->send<Virtmic::get_targets>(); }
+          if (!nodes.count(global.id)) {
+            nodes.emplace(global.id, node.info());
+            link(target, core);
+          }
+        }
+        if (global.type == pipewire::port::type) {
+          auto port = reg.bind<pipewire::port>(global.id);
+          auto info = port.info();
 
-Virtmic::Virtmic(pipewire::receiver<set_target, terminate> receiver,
-                 cr::sender<new_targets> sender) {
-  m_receiver = std::make_unique<pipewire::receiver<set_target, terminate>>(
-      std::move(receiver));
-  m_sender = std::make_unique<cr::sender<new_targets>>(std::move(sender));
-  virtual_mic = std::make_unique<pipewire::proxy>(
-      std::move(*core.create("adapter",
-                             {{"node.name", "discord-screenaudio-virtmic"},
-                              {"media.class", "Audio/Source/Virtual"},
-                              {"factory.name", "support.null-audio-sink"},
-                              {"audio.channels", "2"},
-                              {"audio.position", "FL,FR"}},
-                             pipewire::node::type, pipewire::node::version,
-                             pipewire::update_strategy::none)
-                     .get()));
-  metadata_listener.on<pipewire::registry_event::global>(
-      [&](const auto &global) { globalEvent(global); });
-  metadata_listener.on<pipewire::registry_event::global_removed>(
-      [&](const std::uint32_t id) { globalRemovedEvent(id); });
-}
+          if (info.props.count("node.id")) {
+            auto node_id = std::stoul(info.props["node.id"]);
+
+            if (node_id == virtual_mic.id() &&
+                info.direction == pipewire::port_direction::input) {
+              if (info.props["audio.channel"] == "FL") {
+                virt_fl = std::make_unique<pipewire::port>(std::move(port));
+              } else {
+                virt_fr = std::make_unique<pipewire::port>(std::move(port));
+              }
+            } else {
+              ports.emplace(global.id, std::move(port));
+            }
+
+            link(target, core);
+          }
+        }
+      });
+
+  reg_events.on<pipewire::registry_event::global_removed>(
+      [&](const std::uint32_t id) {
+        if (nodes.count(id)) {
+          auto info = nodes.at(id);
+          std::string name;
+          if (info.props.count("application.name") &&
+              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()
+                                    .data();
+          nodes.erase(id);
+        }
+        if (ports.count(id)) {
+          ports.erase(id);
+        }
+        if (links.count(id)) {
+          links.erase(id);
+        }
+      });
 
-void Virtmic::run() {
   while (true) {
     main_loop.run();
   }
 }
 
-void Virtmic::link() {
-  for (const auto &[port_id, port] : ports) {
-    auto port_info = port.info();
-    if (!virt_fl || !virt_fr)
-      continue;
-
-    if (links.count(port_id))
-      continue;
-
-    if (port_info.direction == pipewire::port_direction::input)
-      continue;
-
-    if (!port_info.props.count("node.id"))
-      continue;
-
-    auto parent_id = std::stoul(port_info.props["node.id"]);
-
-    if (!nodes.count(parent_id))
-      continue;
-
-    auto &parent = nodes[parent_id];
-    QString name;
-    if (parent.props.count("application.name") &&
-        parent.props["application.name"] != "")
-      name = QString::fromStdString(parent.props["application.name"]);
-    else
-      name = QString::fromStdString(parent.props["application.process.binary"]);
-
-    if (name == target ||
-        (target == "[All Desktop Audio]" && !EXCLUDE_TARGETS.contains(name))) {
-      auto fl = port_info.props["audio.channel"] == "FL";
-      links.emplace(port_id,
-                    *core.create_simple<pipewire::link>(fl ? virt_fl->info().id
-                                                           : virt_fr->info().id,
-                                                        port_id)
-                         .get());
-      qDebug(virtmicLog) << QString("Link: %1:%2 -> %3")
-                                .arg(name)
-                                .arg(port_id)
-                                .arg(fl ? virt_fl->info().id
-                                        : virt_fr->info().id)
-                                .toUtf8()
-                                .data();
-    }
-  }
-}
-
-void Virtmic::unlink() { links.clear(); }
-
-void Virtmic::globalEvent(const pipewire::global &global) {
-  if (global.type == pipewire::node::type) {
-    auto node = *reg.bind<pipewire::node>(global.id).get();
-    auto info = node.info();
-    std::string name;
-    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))
-                              .toUtf8()
-                              .data();
-
-    if (!nodes.count(global.id)) {
-      nodes.emplace(global.id, node.info());
-      link();
-    }
-  }
-  if (global.type == pipewire::port::type) {
-    auto port = *reg.bind<pipewire::port>(global.id).get();
-    auto info = port.info();
-
-    if (info.props.count("node.id")) {
-      auto node_id = std::stoul(info.props["node.id"]);
-
-      if (node_id == virtual_mic.get()->id() &&
-          info.direction == pipewire::port_direction::input) {
-        if (info.props["audio.channel"] == "FL") {
-          virt_fl = std::make_unique<pipewire::port>(std::move(port));
-        } else {
-          virt_fr = std::make_unique<pipewire::port>(std::move(port));
-        }
-      } else {
-        ports.emplace(global.id, std::move(port));
-      }
-
-      link();
-    }
-  }
-}
-
-void Virtmic::globalRemovedEvent(const std::uint32_t id) {
-  if (nodes.count(id)) {
-    auto info = nodes.at(id);
-    std::string name;
-    if (info.props.count("application.name") &&
-        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()
-                              .data();
-    nodes.erase(id);
-  }
-  if (ports.count(id)) {
-    ports.erase(id);
-  }
-  if (links.count(id)) {
-    links.erase(id);
-  }
-}
+} // namespace Virtmic

src/virtmic.h

@@ -1,63 +1,12 @@
 #pragma once
 
-#include <cr/channel.hpp>
+#include <QString>
+#include <QVector>
 #include <iostream>
-#include <rohrkabel/channel/channel.hpp>
-#include <rohrkabel/main_loop.hpp>
-#include <rohrkabel/registry/registry.hpp>
 
-#include <QMap>
-#include <QScopedPointer>
-#include <QStringList>
-#include <QThread>
+namespace Virtmic {
 
-class Virtmic : public QObject {
-  Q_OBJECT
-public:
-  static void setTarget(QString target);
-  static void getTargets();
+QVector<QString> getTargets();
+void start(QString _target);
 
-public:
-  struct set_target {
-    QString name;
-  };
-  struct get_targets {};
-  struct terminate {};
-  struct new_targets {
-    QStringList targets;
-  };
-
-protected:
-  static void instance();
-
-protected:
-  Virtmic(pipewire::receiver<set_target, terminate> receiver,
-          cr::sender<new_targets> sender);
-  void run();
-
-private:
-  std::unique_ptr<pipewire::receiver<set_target, terminate>> m_receiver;
-  std::unique_ptr<cr::sender<new_targets>> m_sender;
-
-  const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
-  QString target;
-
-  pipewire::main_loop main_loop = pipewire::main_loop();
-  pipewire::context context = pipewire::context(main_loop);
-  pipewire::core core = pipewire::core(context);
-  pipewire::registry reg = pipewire::registry(core);
-
-  pipewire::registry_listener metadata_listener =
-      reg.listen<pipewire::registry_listener>();
-  std::unique_ptr<pipewire::proxy> virtual_mic;
-
-  std::map<uint32_t, pipewire::port> ports;
-  std::unique_ptr<pipewire::port> virt_fl, virt_fr;
-  std::map<uint32_t, pipewire::node_info> nodes;
-  std::map<uint32_t, pipewire::link> links;
-
-  void link();
-  void unlink();
-  void globalEvent(const pipewire::global &global);
-  void globalRemovedEvent(const std::uint32_t id);
-};
+} // namespace Virtmic