add chromium flags for hardware acceleration

.gitignore

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

CMakeLists.txt

@@ -13,27 +13,24 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 string(TIMESTAMP TIMESTAMP %s)
 # set(CMAKE_AUTOUIC ON)
 
-find_package(Qt5 COMPONENTS Widgets)
-if (Qt5_FOUND)
-  find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
+find_package(Qt5 CONFIG REQUIRED COMPONENTS 
+  Widgets
+  WebEngineWidgets
+)
 
-  find_package(KF5Notifications)
-  if(KF5Notifications_FOUND)
-    add_definitions( -DKNOTIFICATIONS )
-  endif()
+find_package(KF5Notifications)
+if(KF5Notifications_FOUND)
+  add_definitions( -DKNOTIFICATIONS )
+endif()
 
-  find_package(KF5XmlGui)
-  if(KF5XmlGui_FOUND)
-    add_definitions( -DKXMLGUI )
-  endif()
+find_package(KF5XmlGui)
+if(KF5XmlGui_FOUND)
+  add_definitions( -DKXMLGUI )
+endif()
 
-  find_package(KF5GlobalAccel)
-  if(KF5GlobalAccel_FOUND)
-    add_definitions( -DKGLOBALACCEL )
-  endif()
-else()
-  message(WARNING "Qt 5 was not found on your system and Qt 6 will be used. You will not be able to use any features using KDE Frameworks.")
-  find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
+find_package(KF5GlobalAccel)
+if(KF5GlobalAccel_FOUND)
+  add_definitions( -DKGLOBALACCEL )
 endif()
 
 set(discord-screenaudio_SRC
@@ -43,7 +40,6 @@ set(discord-screenaudio_SRC
   src/discordpage.cpp
   src/streamdialog.cpp
   src/log.cpp
-  src/userscript.cpp
   resources.qrc
 )
 
@@ -70,7 +66,7 @@ add_subdirectory(submodules/rohrkabel)
 
 add_executable(discord-screenaudio ${discord-screenaudio_SRC})
 
-target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel)
+target_link_libraries(discord-screenaudio Qt5::Widgets Qt5::WebEngineWidgets rohrkabel)
 
 if(KF5Notifications_FOUND)
   target_link_libraries(discord-screenaudio KF5::Notifications)

README.md

@@ -11,7 +11,7 @@ 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-it-works)).
 
-![Screenshot_20221211_185028](https://user-images.githubusercontent.com/48161361/206920213-58a8091a-d8f9-4bb7-ae3d-3f8581b84d24.png)
+![Screenshot_20220925_112945](https://user-images.githubusercontent.com/48161361/192137080-33466cf7-8c56-4373-90c6-01ea74b6fb83.png)
 
 The purpose of this project is **not** to provide an alternative to the original
 Discord client. Rather, it should be used in addition to the original client in
@@ -50,8 +50,6 @@ You have multiple options:
 ### Requirements
 
 - Basic building tools
-- An up-to-date system (I can't guarantee that it works on Debian or Ubuntu
-  20/21)
 - CMake
 - Qt5 and QtWebEngine
 - **PipeWire** (it currently doesn't work with PulseAudio)
@@ -59,7 +57,7 @@ You have multiple options:
 - _Kf5Notifications (optional, for better notifications)_
 - _KXMLGui and KGlobalAccel (optional, for keybinds)_
 
-With apt:
+On Debian:
 `apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev libkf5xmlgui-dev libkf5globalaccel-dev pkg-config libpipewire-0.3-dev git`
 
 ### Building
@@ -84,9 +82,7 @@ And then to optionally install it, run:
 sudo cmake --install build
 ```
 
-## FAQ
-
-### How does this work?
+## How it works
 
 This whole project is based on
 [this](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
@@ -95,21 +91,6 @@ Discord. Basically: a virtual microphone is created which captures the
 application audio, and this microphone is then fed to the Discord stream by
 intercepting a API call of Discord.
 
-### Drag and drop doesn't work in the Flatpak
-
-This is due to sandboxing limitations of Flatpak. The main Discord Flatpak has
-the same problem. If you still want to use drag and drop, you can disable most
-of Flatpak's sandboxing by installing
-[Flatseal](https://flathub.org/apps/details/com.github.tchx84.Flatseal) and
-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`. But please note that due to
-QtWebEngine limitations concerning content security policies, you can't use any
-external files (like `@import` or `url()`).
-
 ## License
 
 Copyright (C) 2022 Malte Jürgens

assets/de.shorsh.discord-screenaudio.metainfo.xml.in

@@ -4,7 +4,6 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>discord-screenaudio</name>
-  <developer_name>Malte Jürgens</developer_name>
   <releases>
     <release version="${DISCORD_SCEENAUDIO_VERSION_FULL}" timestamp="${TIMESTAMP}" />
   </releases>

assets/userscript.js

@@ -1,3 +1,5 @@
+// From v0.4
+
 navigator.mediaDevices.chromiumGetDisplayMedia =
   navigator.mediaDevices.getDisplayMedia;
 
@@ -14,16 +16,16 @@ const getAudioDevice = async (nameOfAudioDevice) => {
     let devices = await navigator.mediaDevices.enumerateDevices();
     audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
     if (!audioDevice)
-      userscript.log(
-        `Did not find '${nameOfAudioDevice}', trying again in 100ms`
+      console.log(
+        `dsa: Did not find '${nameOfAudioDevice}', trying again in 100ms`
       );
     await sleep(100);
   }
-  userscript.log(`Found '${nameOfAudioDevice}'`);
+  console.log(`dsa: Found '${nameOfAudioDevice}'`);
   return audioDevice;
 };
 
-function setGetDisplayMedia(video = true, overrideArgs = undefined) {
+function setGetDisplayMedia(overrideArgs = undefined) {
   const getDisplayMedia = async (...args) => {
     var id;
     try {
@@ -61,7 +63,6 @@ function setGetDisplayMedia(video = true, overrideArgs = undefined) {
         : args || [{ video: true, audio: true }])
     );
     gdm.addTrack(track);
-    if (!video) for (const track of gdm.getVideoTracks()) track.enabled = false;
     return gdm;
   };
   navigator.mediaDevices.getDisplayMedia = getDisplayMedia;
@@ -69,275 +70,137 @@ function setGetDisplayMedia(video = true, overrideArgs = undefined) {
 
 setGetDisplayMedia();
 
-let userscript;
-let muteBtn;
-let deafenBtn;
-let streamStartBtn;
-let streamStartBtnInitialDisplay;
-let streamStartBtnClone;
-let resolutionString;
 const clonedElements = [];
 const hiddenElements = [];
 let wasStreamActive = false;
 
-function createButton(text, onClick) {
-  const button = document.createElement("button");
-  button.style.marginBottom = "20px";
-  button.classList =
-    "button-ejjZWC lookFilled-1H2Jvj colorBrand-2M3O3N sizeSmall-3R2P2p grow-2T4nbg";
-  button.innerText = text;
-  button.addEventListener("click", onClick);
-  return button;
-}
+setInterval(() => {
+  const streamActive =
+    document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
+      .length > 0;
 
-function createSwitch(text, enabled, onClick) {
-  const container = document.createElement("div");
-  container.style.marginBottom = "20px";
-  container.className = "labelRow-NnoUIp";
+  if (!streamActive && wasStreamActive)
+    console.log("!discord-screenaudio-stream-stopped");
+  wasStreamActive = streamActive;
 
-  const label = document.createElement("label");
-  label.innerText = text;
-  label.className = "title-2yADjX";
-  container.appendChild(label);
+  if (streamActive) {
+    clonedElements.forEach((el) => {
+      el.remove();
+    });
+    clonedElements.length = 0;
 
-  const svg = document.createElement("div");
-  container.appendChild(svg);
+    hiddenElements.forEach((el) => {
+      el.style.display = "block";
+    });
+    hiddenElements.length = 0;
+  } else {
+    for (const el of [
+      document.getElementsByClassName("actionButtons-2vEOUh")?.[0]?.children[1],
+      document.querySelector(
+        ".wrapper-3t3Yqv > div > div > div > div > .controlButton-2PMNom"
+      ),
+    ]) {
+      if (!el) continue;
+      if (el.classList.contains("discord-screenaudio-cloned")) continue;
+      el.classList.add("discord-screenaudio-cloned");
+      elClone = el.cloneNode(true);
+      elClone.title = "Share Your Screen with Audio";
+      elClone.addEventListener("click", () => {
+        console.log("!discord-screenaudio-start-stream");
+      });
 
-  function setSvgDisabled() {
-    svg.innerHTML = `<div class="container-1QtPKm default-colors" style="opacity: 1; background-color: rgb(114, 118, 125);"><svg class="slider-HJFN2i" viewBox="0 0 28 20" preserveAspectRatio="xMinYMid meet" aria-hidden="true" style="left: -3px;"><rect fill="white" x="4" y="0" height="20" width="20" rx="10"></rect><svg viewBox="0 0 20 20" fill="none"><path fill="rgba(114, 118, 125, 1)" d="M5.13231 6.72963L6.7233 5.13864L14.855 13.2704L13.264 14.8614L5.13231 6.72963Z"></path><path fill="rgba(114, 118, 125, 1)" d="M13.2704 5.13864L14.8614 6.72963L6.72963 14.8614L5.13864 13.2704L13.2704 5.13864Z"></path></svg></svg><input id="uid_84" type="checkbox" class="input-125oad" tabindex="0"></div>`;
+      const initialDisplay = el.style.display;
+
+      window.discordScreenaudioStartStream = (width, height, frameRate) => {
+        window.discordScreenaudioResolutionString = `${height}p ${frameRate}FPS`;
+        setGetDisplayMedia({
+          audio: true,
+          video: { width, height, frameRate },
+        });
+        el.click();
+        el.style.display = initialDisplay;
+        elClone.remove();
+      };
+
+      el.style.display = "none";
+      el.parentNode.insertBefore(elClone, el);
+
+      clonedElements.push(elClone);
+      hiddenElements.push(el);
+    }
   }
 
-  function setSvgEnabled() {
-    svg.innerHTML = `<div class="container-1QtPKm default-colors checked-16gMAN" style="opacity: 1; background-color: rgb(59, 165, 92);"><svg class="slider-HJFN2i" viewBox="0 0 28 20" preserveAspectRatio="xMinYMid meet" aria-hidden="true" style="left: 12px;"><rect fill="white" x="4" y="0" height="20" width="20" rx="10"></rect><svg viewBox="0 0 20 20" fill="none"><path fill="rgba(59, 165, 92, 1)" d="M7.89561 14.8538L6.30462 13.2629L14.3099 5.25755L15.9009 6.84854L7.89561 14.8538Z"></path><path fill="rgba(59, 165, 92, 1)" d="M4.08643 11.0903L5.67742 9.49929L9.4485 13.2704L7.85751 14.8614L4.08643 11.0903Z"></path></svg></svg><input id="uid_74" type="checkbox" class="input-125oad" tabindex="0" checked=""></div>`;
+  // Add about text in settings
+  if (
+    document.getElementsByClassName("dirscordScreenaudioAboutText").length == 0
+  ) {
+    for (const el of document.getElementsByClassName("info-3pQQBb")) {
+      let aboutEl;
+      if (window.discordScreenaudioKXMLGUI) {
+        aboutEl = document.createElement("a");
+        aboutEl.addEventListener("click", () => {
+          console.log("!discord-screenaudio-about");
+        });
+      } else {
+        aboutEl = document.createElement("div");
+      }
+      aboutEl.innerText = `discord-screenaudio ${window.discordScreenaudioVersion}`;
+      aboutEl.style.fontSize = "12px";
+      aboutEl.style.color = "var(--text-muted)";
+      aboutEl.style.textTransform = "none";
+      aboutEl.classList.add("dirscordScreenaudioAboutText");
+      aboutEl.style.cursor = "pointer";
+      el.appendChild(aboutEl);
+    }
   }
 
-  function updateSvg() {
-    if (enabled) setSvgEnabled();
-    else setSvgDisabled();
+  // Remove stream settings if stream is active
+  document.getElementById("manage-streams-change-windows")?.remove();
+  document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
+
+  // Add event listener for keybind tab
+  if (
+    document
+      .getElementById("keybinds-tab")
+      ?.getElementsByClassName(
+        "container-3jbRo5 info-1hMolH fontSize16-3zr6Io browserNotice-1u-Y5o"
+      ).length
+  ) {
+    const el = document
+      .getElementById("keybinds-tab")
+      .getElementsByClassName("children-1xdcWE")[0];
+    const div = document.createElement("div");
+    div.style.marginBottom = "50px";
+    const button = document.createElement("button");
+    button.classList =
+      "button-f2h6uQ lookFilled-yCfaCM colorBrand-I6CyqQ sizeSmall-wU2dO- grow-2sR_-F";
+    button.innerText = "Edit Global Keybinds";
+    button.addEventListener("click", () => {
+      console.log("!discord-screenaudio-keybinds");
+    });
+    div.appendChild(button);
+    el.innerHTML = "";
+    el.appendChild(div);
   }
 
-  container.addEventListener("click", () => {
-    enabled = !enabled;
-    updateSvg();
-    onClick(enabled);
-  });
-  updateSvg();
+  const muteBtn = document.getElementsByClassName(
+    "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+  )[0];
+  window.discordScreenaudioToggleMute = () => muteBtn.click();
+  const deafenBtn = document.getElementsByClassName(
+    "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+  )[1];
+  window.discordScreenaudioToggleDeafen = () => deafenBtn.click();
 
-  return container;
-}
+  if (window.discordScreenaudioResolutionString) {
+    for (const el of document.getElementsByClassName(
+      "qualityIndicator-39wQDy"
+    )) {
+      el.innerHTML = window.discordScreenaudioResolutionString;
+    }
+  }
+}, 500);
 
 // Fix for broken discord notifications after restart
 // (https://github.com/maltejur/discord-screenaudio/issues/17)
 Notification.requestPermission();
-
-setTimeout(() => {
-  new QWebChannel(qt.webChannelTransport, (channel) => {
-    userscript = channel.objects.userscript;
-    main();
-  });
-});
-
-function main() {
-  userscript.muteToggled.connect(() => {
-    muteBtn && muteBtn.click();
-  });
-
-  userscript.deafenToggled.connect(() => {
-    deafenBtn && deafenBtn.click();
-  });
-
-  userscript.streamStarted.connect((video, width, height, frameRate) => {
-    resolutionString = video ? `${height}p ${frameRate}FPS` : "Audio Only";
-    setGetDisplayMedia(video, {
-      audio: true,
-      video: { width, height, frameRate },
-    });
-    streamStartBtn.click();
-    streamStartBtn.style.display = streamStartBtnInitialDisplay;
-    streamStartBtnClone.remove();
-  });
-
-  setInterval(async () => {
-    const streamActive =
-      document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
-        .length > 0;
-
-    if (!streamActive && wasStreamActive) userscript.stopVirtmic();
-    wasStreamActive = streamActive;
-
-    if (streamActive) {
-      clonedElements.forEach((el) => {
-        el.remove();
-      });
-      clonedElements.length = 0;
-
-      hiddenElements.forEach((el) => {
-        el.style.display = "block";
-      });
-      hiddenElements.length = 0;
-    } else {
-      for (const el of [
-        document.getElementsByClassName("actionButtons-2vEOUh")?.[0]
-          ?.children[1],
-        document.querySelector(
-          ".wrapper-3t3Yqv > div > div > div > div > .controlButton-2PMNom"
-        ),
-      ]) {
-        if (!el) continue;
-        if (el.classList.contains("discord-screenaudio-cloned")) continue;
-        streamStartBtn = el;
-        streamStartBtn.classList.add("discord-screenaudio-cloned");
-
-        streamStartBtnClone = streamStartBtn.cloneNode(true);
-        streamStartBtnClone.title = "Share Your Screen with Audio";
-        streamStartBtnClone.addEventListener("click", () => {
-          userscript.showStreamDialog();
-        });
-
-        streamStartBtnInitialDisplay = streamStartBtn.style.display;
-
-        streamStartBtn.style.display = "none";
-        streamStartBtn.parentNode.insertBefore(streamStartBtnClone, el);
-
-        clonedElements.push(streamStartBtnClone);
-        hiddenElements.push(streamStartBtn);
-      }
-    }
-
-    // Add about text in settings
-    if (
-      document.getElementsByClassName("dirscordScreenaudioAboutText").length ==
-      0
-    ) {
-      for (const el of document.getElementsByClassName("info-3pQQBb")) {
-        let aboutEl;
-        if (userscript.kxmlgui) {
-          aboutEl = document.createElement("a");
-          aboutEl.addEventListener("click", () => {
-            userscript.showHelpMenu();
-          });
-        } else {
-          aboutEl = document.createElement("div");
-        }
-        aboutEl.innerText = `discord-screenaudio ${userscript.version}`;
-        aboutEl.style.fontSize = "12px";
-        aboutEl.style.color = "var(--text-muted)";
-        aboutEl.style.textTransform = "none";
-        aboutEl.style.display = "inline-block";
-        aboutEl.style.width = "100%";
-        aboutEl.classList.add("dirscordScreenaudioAboutText");
-        aboutEl.style.cursor = "pointer";
-        el.appendChild(aboutEl);
-      }
-    }
-
-    // Remove stream settings if stream is active
-    document.getElementById("manage-streams-change-windows")?.remove();
-    document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
-
-    // Add event listener for keybind tab
-    if (
-      document
-        .getElementById("keybinds-tab")
-        ?.getElementsByClassName(
-          "container-3jbRo5 info-1hMolH browserNotice-1u-Y5o"
-        ).length
-    ) {
-      const el = document
-        .getElementById("keybinds-tab")
-        .getElementsByClassName("children-1xdcWE")[0];
-      const div = document.createElement("div");
-      div.style.marginBottom = "50px";
-      div.appendChild(
-        createButton("Edit Global Keybinds", () => {
-          userscript.showShortcutsDialog();
-        })
-      );
-      el.innerHTML = "";
-      el.appendChild(div);
-    }
-
-    const buttonContainer =
-      document.getElementsByClassName("container-YkUktl")[0];
-    if (!buttonContainer) {
-      userscript.log(
-        "Cannot locate Mute/Deafen/Settings button container, please report this on GitHub"
-      );
-    }
-
-    muteBtn = buttonContainer
-      ? buttonContainer.getElementsByClassName(
-          "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
-        )[0]
-      : null;
-
-    deafenBtn = buttonContainer
-      ? buttonContainer.getElementsByClassName(
-          "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
-        )[1]
-      : null;
-
-    if (resolutionString) {
-      for (const el of document.getElementsByClassName(
-        "qualityIndicator-39wQDy"
-      )) {
-        el.innerHTML = resolutionString;
-      }
-    }
-
-    const accountTab = document.getElementById("my-account-tab");
-    if (accountTab) {
-      const discordScreenaudioSettings = document.getElementById(
-        "discord-screenaudio-settings"
-      );
-      if (!discordScreenaudioSettings) {
-        const firstDivider = accountTab.getElementsByClassName(
-          "divider-3nqZNm marginTop40-Q4o1tS"
-        )[0];
-        if (firstDivider) {
-          const section = document.createElement("div");
-          section.className = "marginTop40-Q4o1tS";
-          section.id = "discord-screenaudio-settings";
-
-          const title = document.createElement("h2");
-          title.className =
-            "h1-3iMExa title-lXcL8p defaultColor-3Olr-9 defaultMarginh1-1UYutH";
-          title.innerText = "discord-screenaudio";
-          section.appendChild(title);
-
-          section.appendChild(
-            createButton("Edit Global Keybinds", () => {
-              userscript.showShortcutsDialog();
-            })
-          );
-
-          section.appendChild(
-            createSwitch(
-              "Move discord-screenaudio to the system tray instead of closing",
-              await userscript.getBoolPref("trayIcon", false),
-              (enabled) => {
-                userscript.setTrayIcon(enabled);
-              }
-            )
-          );
-
-          section.appendChild(
-            createSwitch(
-              "Start discord-screenaudio hidden to tray",
-              await userscript.getPref("startHidden", false),
-              (hidden) => {
-                userscript.setPref("startHidden", hidden);
-              }
-            )
-          );
-
-          const divider = document.createElement("div");
-          divider.className = "divider-3nqZNm marginTop40-Q4o1tS";
-
-          firstDivider.after(section);
-          section.after(divider);
-        }
-      }
-    }
-  }, 500);
-}

assets/vencord/VencordNativeStub.ts

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

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

@@ -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>

resources.qrc

@@ -2,7 +2,6 @@
 <RCC>
   <qresource>
     <file>assets/userscript.js</file>
-    <file>assets/vencord/vencord.js</file>
     <file>assets/de.shorsh.discord-screenaudio.png</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/discordpage.cpp

@@ -3,10 +3,22 @@
 #include "mainwindow.h"
 #include "virtmic.h"
 
+#ifdef KXMLGUI
+#include <KAboutData>
+#include <KHelpMenu>
+#include <KShortcutsDialog>
+#include <KXmlGuiWindow>
+#include <QAction>
+
+#ifdef KGLOBALACCEL
+#include <KGlobalAccel>
+#endif
+
+#endif
+
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFile>
-#include <QFileInfo>
 #include <QMessageBox>
 #include <QNetworkReply>
 #include <QTimer>
@@ -17,40 +29,16 @@
 
 DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
   setBackgroundColor(QColor("#202225"));
+  m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);
 
   connect(this, &QWebEnginePage::featurePermissionRequested, this,
           &DiscordPage::featurePermissionRequested);
 
-  setupPermissions();
+  connect(this, &QWebEnginePage::loadStarted, [=]() {
+    runJavaScript(QString("window.discordScreenaudioVersion = '%1';")
+                      .arg(QApplication::applicationVersion()));
+  });
 
-  injectFile(&DiscordPage::injectScript, "qwebchannel.js",
-             ":/qtwebchannel/qwebchannel.js");
-
-  setUrl(QUrl("https://discord.com/app"));
-
-  setWebChannel(new QWebChannel(this));
-  webChannel()->registerObject("userscript", &m_userScript);
-
-  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();
-}
-
-void DiscordPage::setupPermissions() {
   settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, true);
   settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
   settings()->setAttribute(QWebEngineSettings::AllowRunningInsecureContent,
@@ -62,21 +50,71 @@ void DiscordPage::setupPermissions() {
                            false);
   settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
   settings()->setAttribute(QWebEngineSettings::ScrollAnimatorEnabled, true);
+
+  setUrl(QUrl("https://discord.com/app"));
+
+  injectScriptFile("userscript.js", ":/assets/userscript.js");
+
+  injectScriptText("version.js",
+                   QString("window.discordScreenaudioVersion = '%1';")
+                       .arg(QApplication::applicationVersion()));
+
+#ifdef KXMLGUI
+  injectScriptText("xmlgui.js", "window.discordScreenaudioKXMLGUI = true;");
+
+  KAboutData aboutData(
+      "discord-screenaudio", "discord-screenaudio",
+      QApplication::applicationVersion(),
+      "Custom Discord client with the ability to stream audio on Linux",
+      KAboutLicense::GPL_V3, "Copyright 2022 (C) Malte Jürgens");
+  aboutData.setBugAddress("https://github.com/maltejur/discord-screenaudio");
+  aboutData.addAuthor("Malte Jürgens", "Author", "maltejur@dismail.de",
+                      "https://github.com/maltejur");
+  aboutData.addCredit("edisionnano",
+                      "For creating and documenting the approach for streaming "
+                      "audio in Discord used in this project.",
+                      QString(),
+                      "https://github.com/edisionnano/"
+                      "Screenshare-with-audio-on-Discord-with-Linux");
+  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.3",
+                         "https://github.com/Soundux/rohrkabel");
+  m_helpMenu = new KHelpMenu(parent, aboutData);
+
+#ifdef KGLOBALACCEL
+  injectScriptText("kglobalaccel.js",
+                   "window.discordScreenaudioKGLOBALACCEL = true;");
+
+  auto toggleMuteAction = new QAction(this);
+  toggleMuteAction->setText("Toggle Mute");
+  toggleMuteAction->setIcon(QIcon::fromTheme("microphone-sensitivity-muted"));
+  connect(toggleMuteAction, &QAction::triggered, this,
+          &DiscordPage::toggleMute);
+
+  auto toggleDeafenAction = new QAction(this);
+  toggleDeafenAction->setText("Toggle Deafen");
+  toggleDeafenAction->setIcon(QIcon::fromTheme("audio-volume-muted"));
+  connect(toggleDeafenAction, &QAction::triggered, this,
+          &DiscordPage::toggleDeafen);
+
+  m_actionCollection = new KActionCollection(this);
+  m_actionCollection->addAction("toggleMute", toggleMuteAction);
+  KGlobalAccel::setGlobalShortcut(toggleMuteAction, QList<QKeySequence>{});
+  m_actionCollection->addAction("toggleDeafen", toggleDeafenAction);
+  KGlobalAccel::setGlobalShortcut(toggleDeafenAction, QList<QKeySequence>{});
+
+  m_shortcutsDialog = new KShortcutsDialog(KShortcutsEditor::GlobalAction);
+  m_shortcutsDialog->addCollection(m_actionCollection);
+#endif
+#endif
+
+  connect(&m_streamDialog, &StreamDialog::requestedStreamStart, this,
+          &DiscordPage::startStream);
 }
 
-void DiscordPage::setupUserStyles() {
-  QString file =
-      QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) +
-      "/userstyles.css";
-  if (QFileInfo(file).exists()) {
-    qDebug(mainLog) << "Found userstyles:" << file;
-    injectFile(&DiscordPage::injectStylesheet, "userstyles.js", file);
-  }
-}
-
-void DiscordPage::injectScript(
-    QString name, QString content,
-    QWebEngineScript::InjectionPoint injectionPoint) {
+void DiscordPage::injectScriptText(QString name, QString content) {
   qDebug(mainLog) << "Injecting " << name;
 
   QWebEngineScript script;
@@ -84,37 +122,20 @@ void DiscordPage::injectScript(
   script.setSourceCode(content);
   script.setName(name);
   script.setWorldId(QWebEngineScript::MainWorld);
-  script.setInjectionPoint(injectionPoint);
+  script.setInjectionPoint(QWebEngineScript::DocumentCreation);
   script.setRunsOnSubFrames(false);
 
   scripts().insert(script);
 }
 
-void DiscordPage::injectScript(QString name, QString content) {
-  injectScript(name, content, QWebEngineScript::DocumentCreation);
-}
-
-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);
-)")
-                    .arg(name)
-                    .arg(content);
-  injectScript(name, script, QWebEngineScript::DocumentReady);
-}
-
-void DiscordPage::injectFile(void (DiscordPage::*inject)(QString, QString),
-                             QString name, QString source) {
+void DiscordPage::injectScriptFile(QString name, QString source) {
   QFile file(source);
 
   if (!file.open(QIODevice::ReadOnly)) {
     qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
            file.errorString().toLatin1().constData());
   } else {
-    (this->*inject)(name, file.readAll());
+    injectScriptText(name, file.readAll());
   }
 }
 
@@ -125,10 +146,11 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
                        QWebEnginePage::PermissionGrantedByUser);
 
   if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
-    if (!m_userScript.isVirtmicRunning()) {
+    if (m_virtmicProcess.state() == QProcess::NotRunning) {
       qDebug(virtmicLog) << "Starting Virtmic with no target to make sure "
                             "Discord can find all the audio devices";
-      m_userScript.startVirtmic("None");
+      m_virtmicProcess.start(QApplication::arguments()[0],
+                             {"--virtmic", "None"});
     }
   }
 }
@@ -155,81 +177,78 @@ QWebEnginePage *DiscordPage::createWindow(QWebEnginePage::WebWindowType type) {
   return new ExternalPage;
 }
 
-const QMap<QString, QString> cssAnsiColorMap = {{"black", "30"},
-                                                {"red", "31"},
-                                                {"green", "32"},
-                                                {"yellow", "33"},
-                                                {"blue", "34"},
-                                                {"magenta", "35"},
-                                                {"cyan", "36"},
-                                                {"white", "37"},
-                                                {"gray", "90"},
-                                                {"bright-red", "91"},
-                                                {"bright-green", "92"},
-                                                {"bright-yellow", "93"},
-                                                {"bright-blue", "94"},
-                                                {"bright-magenta", "95"},
-                                                {"bright-cyan", "96"},
-                                                {"bright-white", "97"},
-                                                {"orange", "38;5;208"},
-                                                {"pink", "38;5;205"},
-                                                {"brown", "38;5;94"},
-                                                {"light-gray", "38;5;251"},
-                                                {"dark-gray", "38;5;239"},
-                                                {"light-red", "38;5;203"},
-                                                {"light-green", "38;5;83"},
-                                                {"light-yellow", "38;5;227"},
-                                                {"light-blue", "38;5;75"},
-                                                {"light-magenta", "38;5;207"},
-                                                {"light-cyan", "38;5;87"},
-                                                {"turquoise", "38;5;80"},
-                                                {"violet", "38;5;92"},
-                                                {"purple", "38;5;127"},
-                                                {"lavender", "38;5;183"},
-                                                {"maroon", "38;5;124"},
-                                                {"beige", "38;5;230"},
-                                                {"olive", "38;5;142"},
-                                                {"indigo", "38;5;54"},
-                                                {"teal", "38;5;30"},
-                                                {"gold", "38;5;220"},
-                                                {"silver", "38;5;7"},
-                                                {"navy", "38;5;17"},
-                                                {"steel", "38;5;188"},
-                                                {"salmon", "38;5;173"},
-                                                {"peach", "38;5;217"},
-                                                {"khaki", "38;5;179"},
-                                                {"coral", "38;5;209"},
-                                                {"crimson", "38;5;160"}};
+void DiscordPage::stopVirtmic() {
+  if (m_virtmicProcess.state() == QProcess::Running) {
+    qDebug(virtmicLog) << "Stopping Virtmic";
+    m_virtmicProcess.kill();
+    m_virtmicProcess.waitForFinished();
+  }
+}
+
+void DiscordPage::startVirtmic(QString target) {
+  if (target != "None") {
+    qDebug(virtmicLog) << "Starting Virtmic with target" << target;
+    m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
+  }
+}
 
 void DiscordPage::javaScriptConsoleMessage(
     QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
     int lineNumber, const QString &sourceID) {
-  auto colorSegments = message.split("%c");
-  for (auto segment : colorSegments.mid(1)) {
-    auto lines = segment.split("\n");
-    QString ansi;
-    uint endOfStyles = lines.length();
-    for (size_t line = 1; line < lines.length(); line++) {
-      if (!lines[line].endsWith(";")) {
-        endOfStyles = line;
-        break;
-      }
-      if (lines[line] == "font-weight: bold;")
-        ansi += "\033[1m";
-      else if (lines[line].startsWith("color: ")) {
-        auto color = lines[line].mid(7).chopped(1);
-        if (cssAnsiColorMap.find(color) != cssAnsiColorMap.end())
-          ansi += "\033[" + cssAnsiColorMap[color] + "m";
-      }
-    }
-    qDebug(discordLog) << (ansi + lines[0].trimmed() + "\033[0m " +
-                           ((lines.length() > endOfStyles)
-                                ? lines[endOfStyles].trimmed()
-                                : ""))
-                              .toUtf8()
-                              .constData();
-    for (auto line : lines.mid(endOfStyles + 1)) {
-      qDebug(discordLog) << line.toUtf8().constData();
-    }
+  if (message == "!discord-screenaudio-start-stream") {
+    if (m_streamDialog.isHidden())
+      m_streamDialog.setHidden(false);
+    else
+      m_streamDialog.activateWindow();
+    m_streamDialog.updateTargets();
+  } else if (message == "!discord-screenaudio-stream-stopped") {
+    stopVirtmic();
+  } else if (message == "!discord-screenaudio-about") {
+#ifdef KXMLGUI
+    m_helpMenu->aboutApplication();
+#endif
+  } else if (message == "!discord-screenaudio-keybinds") {
+#ifdef KXMLGUI
+#ifdef KGLOBALACCEL
+    m_shortcutsDialog->show();
+#else
+    QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
+                             "Keybinds are not supported on this platform "
+                             "(KGlobalAccel is not available).",
+                             QMessageBox::Ok);
+#endif
+#else
+    QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
+                             "Keybinds are not supported on this platform "
+                             "(KXmlGui and KGlobalAccel are not available).",
+                             QMessageBox::Ok);
+#endif
+  } else if (message.startsWith("dsa: ")) {
+    qDebug(userscriptLog) << message.mid(5).toUtf8().constData();
+  } else {
+    qDebug(discordLog) << message;
   }
 }
+
+void DiscordPage::startStream(QString target, uint width, uint height,
+                              uint frameRate) {
+  stopVirtmic();
+  startVirtmic(target);
+  // Wait a bit for the virtmic to start
+  QTimer::singleShot(target == "None" ? 0 : 200, [=]() {
+    runJavaScript(QString("window.discordScreenaudioStartStream(%1, %2, %3);")
+                      .arg(width)
+                      .arg(height)
+                      .arg(frameRate));
+  });
+}
+
+void DiscordPage::toggleMute() {
+  qDebug(shortcutLog) << "Toggling mute";
+  runJavaScript("window.discordScreenaudioToggleMute();");
+}
+
+void DiscordPage::toggleDeafen() {
+  qDebug(shortcutLog) << "Toggling deafen";
+  runJavaScript("window.discordScreenaudioToggleDeafen();");
+}

src/discordpage.h

@@ -1,12 +1,17 @@
 #pragma once
 
 #include "streamdialog.h"
-#include "userscript.h"
 #include "virtmic.h"
 
+#ifdef KXMLGUI
+#include <KActionCollection>
+#include <KHelpMenu>
+#include <KShortcutsDialog>
+#endif
+
+#include <QProcess>
 #include <QWebEngineFullScreenRequest>
 #include <QWebEnginePage>
-#include <QWebEngineScript>
 
 class DiscordPage : public QWebEnginePage {
   Q_OBJECT
@@ -15,9 +20,15 @@ public:
   explicit DiscordPage(QWidget *parent = nullptr);
 
 private:
-  UserScript m_userScript;
-  void setupPermissions();
-  void setupUserStyles();
+  StreamDialog m_streamDialog;
+  QProcess m_virtmicProcess;
+#ifdef KXMLGUI
+  KHelpMenu *m_helpMenu;
+#ifdef KGLOBALACCEL
+  KActionCollection *m_actionCollection;
+  KShortcutsDialog *m_shortcutsDialog;
+#endif
+#endif
   bool acceptNavigationRequest(const QUrl &url,
                                QWebEnginePage::NavigationType type,
                                bool isMainFrame) override;
@@ -26,16 +37,17 @@ private:
   javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
                            const QString &message, int lineNumber,
                            const QString &sourceID) override;
-  void injectScript(QString name, QString content,
-                    QWebEngineScript::InjectionPoint injectionPoint);
-  void injectScript(QString name, QString content);
-  void injectStylesheet(QString name, QString content);
-  void injectFile(void (DiscordPage::*inject)(QString, QString), QString name,
-                  QString source);
+  void injectScriptText(QString name, QString content);
+  void injectScriptFile(QString name, QString source);
+  void stopVirtmic();
+  void startVirtmic(QString target);
+  void toggleMute();
+  void toggleDeafen();
 
 private Q_SLOTS:
   void featurePermissionRequested(const QUrl &securityOrigin,
                                   QWebEnginePage::Feature feature);
+  void startStream(QString target, uint width, uint height, uint frameRate);
 };
 
 // Will immediately get destroyed again but is needed for navigation to

src/main.cpp

@@ -30,9 +30,6 @@ int main(int argc, char *argv[]) {
   QCommandLineOption degubOption("remote-debugging",
                                  "Open Chromium Remote Debugging on port 9222");
   parser.addOption(degubOption);
-  QCommandLineOption notifySendOption(
-      "notify-send", "Use notify-send instead of QT/KF5 notifications");
-  parser.addOption(notifySendOption);
 
   parser.process(app);
 
@@ -41,6 +38,8 @@ int main(int argc, char *argv[]) {
   }
 
   qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
+          "--ignore-gpu-blacklist --enable-gpu-rasterization "
+          "--enable-native-gpu-memory-buffers --num-raster-threads=4 "
           "--enable-features=WebRTCPipeWireCapturer " +
               qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[]) {
             "--remote-debugging-port=9222 " +
                 qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
 
-  MainWindow w(parser.isSet(notifySendOption));
+  MainWindow w;
   w.show();
 
   return app.exec();

src/mainwindow.cpp

@@ -14,7 +14,6 @@
 #include <QPushButton>
 #include <QSpacerItem>
 #include <QThread>
-#include <QTimer>
 #include <QUrl>
 #include <QWebEngineNotification>
 #include <QWebEngineProfile>
@@ -25,21 +24,12 @@
 
 MainWindow *MainWindow::m_instance = nullptr;
 
-MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
-    : QMainWindow(parent) {
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
   assert(MainWindow::m_instance == nullptr);
   MainWindow::m_instance = this;
-  m_useNotifySend = useNotifySend;
-  setupSettings();
   setupWebView();
-  setupTrayIcon();
   resize(1000, 700);
   showMaximized();
-  if (m_settings->value("trayIcon", false).toBool() &&
-      m_settings->value("startHidden", false).toBool()) {
-    hide();
-    QTimer::singleShot(0, [=]() { hide(); });
-  }
 }
 
 void MainWindow::setupWebView() {
@@ -50,37 +40,22 @@ void MainWindow::setupWebView() {
   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();
+  QWebEngineProfile::defaultProfile()->setNotificationPresenter(
+      [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
+        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();
+                  activateWindow();
+                });
+        notification->sendEvent();
+      });
 #endif
-          }
-        });
 
   setCentralWidget(m_webView);
 }
@@ -96,72 +71,6 @@ void MainWindow::fullScreenRequested(
   }
 }
 
-void MainWindow::setupTrayIcon() {
-  if (m_settings->value("trayIcon", false).toBool() == false ||
-      m_trayIcon != nullptr)
-    return;
-
-  auto aboutAction = new QAction(
-      "discord-screenaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
-  aboutAction->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-  aboutAction->setEnabled(false);
-
-  auto exitAction = new QAction("Exit", this);
-  connect(exitAction, &QAction::triggered, []() { QApplication::quit(); });
-
-  m_trayIconMenu = new QMenu(this);
-  m_trayIconMenu->addAction(aboutAction);
-  m_trayIconMenu->addAction(exitAction);
-
-  m_trayIcon = new QSystemTrayIcon(this);
-  m_trayIcon->setContextMenu(m_trayIconMenu);
-  m_trayIcon->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-  m_trayIcon->show();
-
-  connect(m_trayIcon, &QSystemTrayIcon::activated, [this](auto reason) {
-    if (reason == QSystemTrayIcon::Trigger) {
-      if (isVisible()) {
-        hide();
-      } else {
-        show();
-        activateWindow();
-      }
-    }
-  });
-}
-
-void MainWindow::cleanTrayIcon() {
-  if (m_trayIcon == nullptr)
-    return;
-  m_trayIcon->hide();
-  m_trayIconMenu->deleteLater();
-  m_trayIcon->deleteLater();
-  m_trayIconMenu = nullptr;
-  m_trayIcon = nullptr;
-}
-
-void MainWindow::setupSettings() {
-  m_settings = new QSettings("maltejur", "discord-screenaudio", this);
-  m_settings->beginGroup("settings");
-  m_settings->endGroup();
-}
-
-QSettings *MainWindow::settings() const { return m_settings; }
-
-void MainWindow::setTrayIcon(bool enabled) {
-  m_settings->setValue("trayIcon", enabled);
-  if (enabled) {
-    setupTrayIcon();
-  } else {
-    cleanTrayIcon();
-  }
-}
-
-void MainWindow::closeEvent(QCloseEvent *event) {
-  if (m_settings->value("trayIcon", false).toBool()) {
-    hide();
-  } else
-    QApplication::quit();
-}
+void MainWindow::closeEvent(QCloseEvent *event) { QApplication::quit(); }
 
 MainWindow *MainWindow::instance() { return m_instance; }

src/mainwindow.h

@@ -3,11 +3,8 @@
 #include "discordpage.h"
 
 #include <QMainWindow>
-#include <QMenu>
 #include <QScopedPointer>
-#include <QSettings>
 #include <QString>
-#include <QSystemTrayIcon>
 #include <QVector>
 #include <QWebEnginePage>
 #include <QWebEngineProfile>
@@ -17,33 +14,17 @@ class MainWindow : public QMainWindow {
   Q_OBJECT
 
 public:
-  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
+  explicit MainWindow(QWidget *parent = nullptr);
   static MainWindow *instance();
-  QSettings *settings() const;
 
 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;
-  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

@@ -9,95 +9,73 @@
 #include <QSizePolicy>
 #include <QVBoxLayout>
 
-StreamDialog::StreamDialog(QWidget *parent) : QDialog(parent) {
+StreamDialog::StreamDialog() : QWidget() {
   setAttribute(Qt::WA_QuitOnClose, false);
 
-  {
-    auto layout = new QVBoxLayout(this);
-    layout->setSizeConstraint(QLayout::SetFixedSize);
+  auto layout = new QVBoxLayout(this);
+  layout->setSizeConstraint(QLayout::SetFixedSize);
 
-    m_videoGroupBox = new QGroupBox(this);
-    m_videoGroupBox->setTitle("Video");
-    m_videoGroupBox->setCheckable(true);
-    layout->addWidget(m_videoGroupBox);
+  auto targetLabel = new QLabel(this);
+  targetLabel->setText("Which app do you want to stream sound from?");
+  layout->addWidget(targetLabel);
 
-    {
-      auto videoLayout = new QVBoxLayout(m_videoGroupBox);
+  auto targetHBox = new QHBoxLayout(this);
+  layout->addLayout(targetHBox);
 
-      auto resolutionLabel = new QLabel(this);
-      resolutionLabel->setText("Resolution");
-      videoLayout->addWidget(resolutionLabel);
+  m_targetComboBox = new QComboBox(this);
+  updateTargets();
+  targetHBox->addWidget(m_targetComboBox);
 
-      m_resolutionComboBox = new QComboBox(this);
-      m_resolutionComboBox->addItem("2160p", "3840x2160");
-      m_resolutionComboBox->addItem("1440p", "2560x1440");
-      m_resolutionComboBox->addItem("1080p", "1920x1080");
-      m_resolutionComboBox->addItem("720p", "1280x720");
-      m_resolutionComboBox->addItem("480p", "854x480");
-      m_resolutionComboBox->addItem("360p", "640x360");
-      m_resolutionComboBox->addItem("240p", "426x240");
-      m_resolutionComboBox->setCurrentText("720p");
-      videoLayout->addWidget(m_resolutionComboBox);
+  auto refreshTargetsButton = new QPushButton(this);
+  refreshTargetsButton->setFixedSize(30, 30);
+  refreshTargetsButton->setIcon(QIcon::fromTheme("view-refresh"));
+  connect(refreshTargetsButton, &QPushButton::clicked, this,
+          &StreamDialog::updateTargets);
+  targetHBox->addWidget(refreshTargetsButton);
 
-      auto framerateLabel = new QLabel(this);
-      framerateLabel->setText("Framerate");
-      videoLayout->addWidget(framerateLabel);
+  auto qualityLabel = new QLabel(this);
+  qualityLabel->setText("Stream Quality");
+  layout->addWidget(qualityLabel);
 
-      m_framerateComboBox = new QComboBox(this);
-      m_framerateComboBox->addItem("144 FPS", 144);
-      m_framerateComboBox->addItem("60 FPS", 60);
-      m_framerateComboBox->addItem("30 FPS", 30);
-      m_framerateComboBox->addItem("15 FPS", 15);
-      m_framerateComboBox->addItem("5 FPS", 5);
-      m_framerateComboBox->setCurrentText("30 FPS");
-      videoLayout->addWidget(m_framerateComboBox);
-    }
+  auto qualityHBox = new QHBoxLayout(this);
+  layout->addLayout(qualityHBox);
 
-    m_audioGroupBox = new QGroupBox(this);
-    m_audioGroupBox->setCheckable(true);
-    m_audioGroupBox->setTitle("Audio");
-    layout->addWidget(m_audioGroupBox);
+  m_qualityResolutionComboBox = new QComboBox(this);
+  m_qualityResolutionComboBox->addItem("2160p", "3840x2160");
+  m_qualityResolutionComboBox->addItem("1440p", "2560x1440");
+  m_qualityResolutionComboBox->addItem("1080p", "1920x1080");
+  m_qualityResolutionComboBox->addItem("720p", "1280x720");
+  m_qualityResolutionComboBox->addItem("480p", "854x480");
+  m_qualityResolutionComboBox->addItem("360p", "640x360");
+  m_qualityResolutionComboBox->addItem("240p", "426x240");
+  m_qualityResolutionComboBox->setCurrentText("720p");
+  qualityHBox->addWidget(m_qualityResolutionComboBox);
 
-    {
-      auto audioLayout = new QVBoxLayout(m_audioGroupBox);
+  m_qualityFPSComboBox = new QComboBox(this);
+  m_qualityFPSComboBox->addItem("144 FPS", 144);
+  m_qualityFPSComboBox->addItem("60 FPS", 60);
+  m_qualityFPSComboBox->addItem("30 FPS", 30);
+  m_qualityFPSComboBox->addItem("15 FPS", 15);
+  m_qualityFPSComboBox->addItem("5 FPS", 5);
+  m_qualityFPSComboBox->setCurrentText("30 FPS");
+  qualityHBox->addWidget(m_qualityFPSComboBox);
 
-      auto targetLabel = new QLabel(this);
-      targetLabel->setText("Audio Source");
-      audioLayout->addWidget(targetLabel);
+  auto button = new QPushButton(this);
+  button->setText("Start Stream");
+  connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
+  layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
 
-      {
-        auto targetLayout = new QHBoxLayout();
-        audioLayout->addLayout(targetLayout);
-
-        m_targetComboBox = new QComboBox(this);
-        updateTargets();
-        targetLayout->addWidget(m_targetComboBox);
-
-        auto refreshTargetsButton = new QPushButton(this);
-        refreshTargetsButton->setFixedSize(30, 30);
-        refreshTargetsButton->setIcon(QIcon::fromTheme("view-refresh"));
-        connect(refreshTargetsButton, &QPushButton::clicked, this,
-                &StreamDialog::updateTargets);
-        targetLayout->addWidget(refreshTargetsButton);
-      }
-    }
-
-    auto button = new QPushButton(this);
-    button->setText("Start Stream");
-    connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
-    layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
-  }
+  setLayout(layout);
 
   setWindowTitle("discord-screenaudio Stream Dialog");
 }
 
 void StreamDialog::startStream() {
-  auto resolution = m_resolutionComboBox->currentData().toString().split('x');
-  emit requestedStreamStart(m_videoGroupBox->isChecked(),
-                            m_audioGroupBox->isChecked(), resolution[0].toInt(),
-                            resolution[1].toInt(),
-                            m_framerateComboBox->currentData().toInt(),
-                            m_targetComboBox->currentText());
+  auto resolution =
+      m_qualityResolutionComboBox->currentData().toString().split('x');
+  emit requestedStreamStart(m_targetComboBox->currentText(),
+                            resolution[0].toUInt(), resolution[1].toUInt(),
+                            m_qualityFPSComboBox->currentData().toUInt());
   setHidden(true);
 }
 
@@ -105,6 +83,7 @@ void StreamDialog::updateTargets() {
   auto lastTarget = m_targetComboBox->currentText();
 
   m_targetComboBox->clear();
+  m_targetComboBox->addItem("[None]");
   m_targetComboBox->addItem("[All Desktop Audio]");
   for (auto target : Virtmic::getTargets()) {
     m_targetComboBox->addItem(target);

src/streamdialog.h

@@ -2,25 +2,22 @@
 
 #include <QComboBox>
 #include <QDialog>
-#include <QGroupBox>
 #include <QWidget>
 
-class StreamDialog : public QDialog {
+class StreamDialog : public QWidget {
   Q_OBJECT
 
 public:
-  explicit StreamDialog(QWidget *parent = nullptr);
+  explicit StreamDialog();
 
 private:
   QComboBox *m_targetComboBox;
-  QComboBox *m_resolutionComboBox;
-  QComboBox *m_framerateComboBox;
-  QGroupBox *m_videoGroupBox;
-  QGroupBox *m_audioGroupBox;
+  QComboBox *m_qualityResolutionComboBox;
+  QComboBox *m_qualityFPSComboBox;
 
 Q_SIGNALS:
-  void requestedStreamStart(bool video, bool audio, int width, int height,
-                            int frameRate, QString target);
+  void requestedStreamStart(QString target, uint width, uint height,
+                            uint frameRate);
 
 public Q_SLOTS:
   void updateTargets();

src/userscript.cpp

@@ -1,234 +0,0 @@
-#include "userscript.h"
-#include "log.h"
-#include "mainwindow.h"
-
-#include <QApplication>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QDir>
-#include <QFile>
-#include <QStandardPaths>
-#include <QTimer>
-
-#ifdef KXMLGUI
-#include <KActionCollection>
-#endif
-
-UserScript::UserScript() : QObject() {
-  setupHelpMenu();
-  setupShortcutsDialog();
-  setupStreamDialog();
-  setupVirtmic();
-}
-
-void UserScript::setupHelpMenu() {
-#ifdef KXMLGUI
-  m_kxmlgui = true;
-
-  KAboutData aboutData(
-      "discord-screenaudio", "discord-screenaudio",
-      QApplication::applicationVersion(),
-      "Custom Discord client with the ability to stream audio on Linux",
-      KAboutLicense::GPL_V3, "Copyright 2022 (C) Malte Jürgens");
-  aboutData.setBugAddress("https://github.com/maltejur/discord-screenaudio");
-  aboutData.addAuthor("Malte Jürgens", "Author", "maltejur@dismail.de",
-                      "https://github.com/maltejur");
-  aboutData.addCredit("edisionnano",
-                      "For creating and documenting the approach for streaming "
-                      "audio in Discord used in this project.",
-                      QString(),
-                      "https://github.com/edisionnano/"
-                      "Screenshare-with-audio-on-Discord-with-Linux");
-  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.3",
-                         "https://github.com/Soundux/rohrkabel");
-  m_helpMenu = new KHelpMenu(MainWindow::instance(), aboutData);
-#endif
-}
-
-void UserScript::setupShortcutsDialog() {
-#ifdef KXMLGUI
-#ifdef KGLOBALACCEL
-  m_kglobalaccel = true;
-
-  auto toggleMuteAction = new QAction(this);
-  toggleMuteAction->setText("Toggle Mute");
-  toggleMuteAction->setIcon(QIcon::fromTheme("microphone-sensitivity-muted"));
-  connect(toggleMuteAction, &QAction::triggered, this,
-          &UserScript::muteToggled);
-
-  auto toggleDeafenAction = new QAction(this);
-  toggleDeafenAction->setText("Toggle Deafen");
-  toggleDeafenAction->setIcon(QIcon::fromTheme("audio-volume-muted"));
-  connect(toggleMuteAction, &QAction::triggered, this,
-          &UserScript::deafenToggled);
-
-  m_actionCollection = new KActionCollection(this);
-  m_actionCollection->addAction("toggleMute", toggleMuteAction);
-  KGlobalAccel::setGlobalShortcut(toggleMuteAction, QList<QKeySequence>{});
-  m_actionCollection->addAction("toggleDeafen", toggleDeafenAction);
-  KGlobalAccel::setGlobalShortcut(toggleDeafenAction, QList<QKeySequence>{});
-
-  m_shortcutsDialog = new KShortcutsDialog(KShortcutsEditor::GlobalAction);
-  m_shortcutsDialog->addCollection(m_actionCollection);
-#endif
-#endif
-}
-
-void UserScript::setupStreamDialog() {
-  m_streamDialog = new StreamDialog(MainWindow::instance());
-  connect(m_streamDialog, &StreamDialog::requestedStreamStart, this,
-          &UserScript::startStream);
-}
-
-void UserScript::setupVirtmic() {
-  m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);
-}
-
-bool UserScript::isVirtmicRunning() {
-  return m_virtmicProcess.state() != QProcess::NotRunning;
-}
-
-QString UserScript::version() { return QApplication::applicationVersion(); }
-
-QVariant UserScript::getPref(QString name, QVariant fallback) {
-  return MainWindow::instance()->settings()->value(name, fallback);
-}
-
-bool UserScript::getBoolPref(QString name, bool fallback) {
-  return getPref(name, fallback).toBool();
-}
-
-void UserScript::setPref(QString name, QVariant value) {
-  return MainWindow::instance()->settings()->setValue(name, value);
-}
-
-void UserScript::setTrayIcon(bool value) {
-  setPref("trayIcon", value);
-  MainWindow::instance()->setTrayIcon(value);
-}
-
-void UserScript::log(QString message) {
-  qDebug(userscriptLog) << message.toUtf8().constData();
-}
-
-void UserScript::showShortcutsDialog() {
-#ifdef KXMLGUI
-#ifdef KGLOBALACCEL
-  m_shortcutsDialog->show();
-#else
-  QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
-                           "Keybinds are not supported on this platform "
-                           "(KGlobalAccel is not available).",
-                           QMessageBox::Ok);
-#endif
-#else
-  QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
-                           "Keybinds are not supported on this platform "
-                           "(KXmlGui and KGlobalAccel are not available).",
-                           QMessageBox::Ok);
-#endif
-}
-
-void UserScript::showHelpMenu() {
-#ifdef KXMLGUI
-  m_helpMenu->aboutApplication();
-#endif
-}
-
-void UserScript::stopVirtmic() {
-  if (m_virtmicProcess.state() == QProcess::Running) {
-    qDebug(virtmicLog) << "Stopping Virtmic";
-    m_virtmicProcess.kill();
-    m_virtmicProcess.waitForFinished();
-  }
-}
-
-void UserScript::startVirtmic(QString target) {
-  qDebug(virtmicLog) << "Starting Virtmic with target" << target;
-  m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", 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, [=]() { emit streamStarted(video, width, height, frameRate); });
-}
-
-void UserScript::showStreamDialog() {
-  if (m_streamDialog->isHidden())
-    m_streamDialog->setHidden(false);
-  else
-    m_streamDialog->activateWindow();
-  m_streamDialog->updateTargets();
-}
-
-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,71 +0,0 @@
-#pragma once
-
-#include "streamdialog.h"
-
-#include <QObject>
-#include <QProcess>
-
-#ifdef KXMLGUI
-#include <KAboutData>
-#include <KHelpMenu>
-#include <KShortcutsDialog>
-#include <KXmlGuiWindow>
-#include <QAction>
-
-#ifdef KGLOBALACCEL
-#include <KGlobalAccel>
-#endif
-
-#endif
-
-class UserScript : public QObject {
-  Q_OBJECT
-
-public:
-  UserScript();
-  bool isVirtmicRunning();
-  Q_PROPERTY(QString version READ version CONSTANT);
-  Q_PROPERTY(bool kxmlgui MEMBER m_kxmlgui CONSTANT);
-  Q_PROPERTY(bool kglobalaccel MEMBER m_kglobalaccel CONSTANT);
-
-private:
-  QProcess m_virtmicProcess;
-  StreamDialog *m_streamDialog;
-  bool m_kxmlgui = false;
-  bool m_kglobalaccel = false;
-#ifdef KXMLGUI
-  KHelpMenu *m_helpMenu;
-#ifdef KGLOBALACCEL
-  KActionCollection *m_actionCollection;
-  KShortcutsDialog *m_shortcutsDialog;
-#endif
-#endif
-  QString m_vencordSettings;
-  void setupHelpMenu();
-  void setupShortcutsDialog();
-  void setupStreamDialog();
-  void setupVirtmic();
-
-Q_SIGNALS:
-  void muteToggled();
-  void deafenToggled();
-  void streamStarted(bool video, int width, int height, int frameRate);
-
-public Q_SLOTS:
-  void log(QString message);
-  QString version();
-  QVariant getPref(QString name, QVariant fallback);
-  bool getBoolPref(QString name, bool fallback);
-  void setPref(QString name, QVariant value);
-  void setTrayIcon(bool value);
-  void showShortcutsDialog();
-  void showHelpMenu();
-  void showStreamDialog();
-  void stopVirtmic();
-  void startVirtmic(QString target);
-  QVariant vencordSend(QString event, QVariantList args);
-
-private Q_SLOTS:
-  void startStream(bool video, bool audio, int width, int height, int frameRate,
-                   QString target);
-};

src/virtmic.cpp

@@ -22,13 +22,7 @@ QVector<QString> getTargets() {
         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"]);
+          auto name = QString::fromStdString(info.props["application.name"]);
 
           if (name != "" && !EXCLUDE_TARGETS.contains(name) &&
               !targets.contains(name)) {
@@ -73,12 +67,7 @@ void start(QString _target) {
         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"];
+      auto name = parent.props["application.name"];
 
       if (name == target ||
           (target == "[All Desktop Audio]" &&
@@ -89,7 +78,8 @@ void start(QString _target) {
             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(QString::fromStdString(
+                                      parent.props["application.name"]))
                                   .arg(port_id)
                                   .arg(fl ? virt_fl->info().id
                                           : virt_fr->info().id)
@@ -122,17 +112,11 @@ void start(QString _target) {
       [&](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
+          if (!node.info().props.count("application.name"))
             return;
           qDebug(virtmicLog) << QString("Added: %1")
-                                    .arg(QString::fromStdString(name))
+                                    .arg(QString::fromStdString(
+                                        node.info().props["application.name"]))
                                     .toUtf8()
                                     .data();
 
@@ -168,14 +152,9 @@ void start(QString _target) {
       [&](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))
+                                    .arg(QString::fromStdString(
+                                        info.props["application.name"].data()))
                                     .toUtf8()
                                     .data();
           nodes.erase(id);