bump version

Merge branch 'master' into appimage
2022-07-27 21:25:24 +02:00 · 2022-07-27 21:24:54 +02:00 · 2022-07-27 20:45:16 +02:00 · 2022-07-17 19:43:36 +02:00 · 2022-07-16 22:28:16 +02:00 · 2022-07-16 22:03:33 +02:00
33 changed files with 327 additions and 1942 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 /build
-.vscode
-/submodules/Vencord
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,49 +1,24 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(discord-screenaudio)

-include(version.cmake)
-determine_version("${CMAKE_CURRENT_SOURCE_DIR}" DISCORD_SCEENAUDIO)
-add_definitions( -DDISCORD_SCEENAUDIO_VERSION_FULL="${DISCORD_SCEENAUDIO_VERSION_FULL}" )
-
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 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(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)
-endif()
-
-set(discord-screenaudio_SRC
+set(${CMAKE_PROJECT_NAME}_SRC
  src/main.cpp
  src/mainwindow.cpp
  src/virtmic.cpp
  src/discordpage.cpp
  src/streamdialog.cpp
-  src/log.cpp
-  src/userscript.cpp
  resources.qrc
 )

@@ -68,23 +43,12 @@ endif()

 add_subdirectory(submodules/rohrkabel)

-add_executable(discord-screenaudio ${discord-screenaudio_SRC})
+add_executable(${CMAKE_PROJECT_NAME} ${${CMAKE_PROJECT_NAME}_SRC})

-target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel)
+target_link_libraries(${CMAKE_PROJECT_NAME} Qt5::Widgets Qt5::WebEngineWidgets rohrkabel)

-if(KF5Notifications_FOUND)
-  target_link_libraries(discord-screenaudio KF5::Notifications)
-  install(FILES assets/discord-screenaudio.notifyrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/knotifications5)
-endif()
-if(KF5XmlGui_FOUND)
-  target_link_libraries(discord-screenaudio KF5::XmlGui)
-endif()
-if(KF5GlobalAccel_FOUND)
-  target_link_libraries(discord-screenaudio KF5::GlobalAccel)
-endif()
+install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION bin)
+install(PROGRAMS assets/${CMAKE_PROJECT_NAME}.desktop DESTINATION share/applications)
+install(FILES assets/discord.png DESTINATION share/pixmaps)

-install(TARGETS discord-screenaudio DESTINATION bin)
-install(FILES assets/de.shorsh.discord-screenaudio.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
-install(PROGRAMS assets/de.shorsh.discord-screenaudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-configure_file(assets/de.shorsh.discord-screenaudio.metainfo.xml.in de.shorsh.discord-screenaudio.metainfo.xml)
-install(FILES ${CMAKE_BINARY_DIR}/de.shorsh.discord-screenaudio.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+add_custom_target(appimage ${CMAKE_SOURCE_DIR}/scripts/build-appimage.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--- a/README.md
+++ b/README.md
@@ -1,17 +1,13 @@
 # discord-screenaudio

-A custom discord client that supports streaming with audio on Linux, made
-possible by the
+A very WIP custom discord client that supports streaming with audio on Linux,
+made possible by the
 [great work](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
 of [@edisionnano](https://github.com/edisionnano) and the
 [Rohrkabel library](https://github.com/Soundux/rohrkabel) by
 [@Curve](https://github.com/Curve).

-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_20220718_194357](https://user-images.githubusercontent.com/48161361/179571245-11ea05f3-fb5e-4aef-9132-2736e122ef04.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
@@ -19,48 +15,31 @@ case you want to stream something, maybe used with a second account. For
 anything else, this client has way too many things that work less well than in
 the original client.

-Technically this could be against
-[Discord's TOS](https://discord.com/terms#software-in-discord%E2%80%99s-services),
-so be warned. Discord probably won't ban you for using this, but if they do I
-told you and it's not my fault.
-
 ## Known Issues

 - Only works with **PipeWire**
- Can only share primary screen on X11 (no other screens or specific
-  applications) (see
+- Only works on **X11**
+- Can only share primary screen (no other screens or specific applications) (see
  [#1](https://github.com/maltejur/discord-screenaudio/issues/1))

 ## Installation

-You have multiple options:
-
- Install the Flatpak (recommended):
-  `flatpak install de.shorsh.discord-screenaudio`
- If you are on Arch, you can build and install
-  [`discord-screenaudio`](https://aur.archlinux.org/packages/discord-screenaudio)
-  from the AUR
- If you are on openSUSE, you can use the
-  [Open Build Service package](https://software.opensuse.org//download.html?project=games%3Atools&package=discord-screenaudio)
-  by [@VortexAcherontic](https://github.com/VortexAcherontic)
- You can [build it yourself](#building-from-source)
+If you are using Arch, you can build and install
+[from the AUR](https://aur.archlinux.org/packages/discord-screenaudio). If you
+aren't, you will have to [build it yourself](#building-from-source).

 ## Building from Source

 ### 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)
 - Git
- _Kf5Notifications (optional, for better notifications)_
- _KXMLGui and KGlobalAccel (optional, for keybinds)_

-With apt:
-`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev libkf5xmlgui-dev libkf5globalaccel-dev pkg-config libpipewire-0.3-dev git`
+On Debian:
+`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev pkg-config libpipewire-0.3-dev git`

 ### Building

@@ -84,9 +63,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 +72,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
--- a/assets/de.shorsh.discord-screenaudio.desktop
+++ b/assets/de.shorsh.discord-screenaudio.desktop
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=discord-screenaudio
-Exec=discord-screenaudio
-Comment=A custom discord client that supports streaming with audio on Linux.
-Icon=de.shorsh.discord-screenaudio
-Categories=Network;InstantMessaging;
-Terminal=false
--- a/assets/de.shorsh.discord-screenaudio.metainfo.xml.in
+++ b/assets/de.shorsh.discord-screenaudio.metainfo.xml.in
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>de.shorsh.discord-screenaudio</id>
-  <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>
-
-  <summary>A custom discord client that supports streaming with audio on Linux</summary>
-
-  <description>
-    <p>A custom discord client that supports streaming with audio on Linux, made possible by the great work of @edisionnano and the Rohrkabel library by @Curve.</p>
-    <p>Unlike a lot of other solutions, the audio here is directly fed into the screenshare and not passed to the user microphone.</p>
-    <p>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 case you want to stream something, maybe used with a second account. For anything else, this client has way too many things that work less well than in the original client.</p>
-    <p>Technically this could be against Discord's TOS, so be warned. Discord probably won't ban you for using this, but if they do I told you and it's not my fault.</p>
-    <p>Known issues:</p>
-    <ul>
-      <li>Only works with PipeWire</li>
-      <li>Can only share primary screen on X11</li>
-    </ul>
-  </description>
-
-  <launchable type="desktop-id">
-    de.shorsh.discord-screenaudio.desktop
-  </launchable>
-
-  <screenshots>
-    <screenshot type="default">
-      <image>
-        https://user-images.githubusercontent.com/48161361/192137080-33466cf7-8c56-4373-90c6-01ea74b6fb83.png
-      </image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">https://github.com/maltejur/discord-screenaudio</url>
-
-  <provides>
-    <binary>discord-screenaudio</binary>
-  </provides>
-
-  <content_rating type="oars-1.0">
-    <content_attribute id="social-chat">intense</content_attribute>
-    <content_attribute id="social-info">intense</content_attribute>
-    <content_attribute id="social-audio">intense</content_attribute>
-    <content_attribute id="social-contacts">intense</content_attribute>
-    <content_attribute id="money-purchasing">mild</content_attribute>
-  </content_rating>
-</component>
--- a/assets/de.shorsh.discord-screenaudio.png
+++ b/assets/de.shorsh.discord-screenaudio.png
--- a/assets/discord-screenaudio.desktop
+++ b/assets/discord-screenaudio.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=discord-screenaudio
+Exec=discord-screenaudio
+Icon=discord
+Terminal=false
+Categories=Audio;
--- a/assets/discord-screenaudio.notifyrc
+++ b/assets/discord-screenaudio.notifyrc
@@ -1,8 +0,0 @@
-[Global]
-IconName=de.shorsh.discord-screenaudio
-Name=discord-screenaudio
-DesktopEntry=de.shorsh.discord-screenaudio.desktop
-
-[Event/discordNotification]
-Name=Discord Notification
-Action=Popup
--- a/assets/discord.png
+++ b/assets/discord.png
--- a/assets/userscript.js
+++ b/assets/userscript.js
@@ -1,29 +1,18 @@
+// From v0.4
+
 navigator.mediaDevices.chromiumGetDisplayMedia =
  navigator.mediaDevices.getDisplayMedia;

-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 const getAudioDevice = async (nameOfAudioDevice) => {
  await navigator.mediaDevices.getUserMedia({
    audio: true,
  });
-  let audioDevice;
-  while (audioDevice === undefined) {
-    let devices = await navigator.mediaDevices.enumerateDevices();
-    audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
-    if (!audioDevice)
-      userscript.log(
-        `Did not find '${nameOfAudioDevice}', trying again in 100ms`
-      );
-    await sleep(100);
-  }
-  userscript.log(`Found '${nameOfAudioDevice}'`);
+  let devices = await navigator.mediaDevices.enumerateDevices();
+  let audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
  return audioDevice;
 };

-function setGetDisplayMedia(video = true, overrideArgs = undefined) {
+function setGetDisplayMedia(overrideArgs = undefined) {
  const getDisplayMedia = async (...args) => {
    var id;
    try {
@@ -61,7 +50,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 +57,79 @@ 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.querySelectorAll(
+      '[aria-label="Share Your Screen"]'
+    )) {
+      elClone = el.cloneNode(true);
+      elClone.ariaLabel = "Share Your Screen with Audio";
+      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) => {
+        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")) {
+      const aboutEl = document.createElement("div");
+      aboutEl.innerText = "discord-screenaudio v1.0.0-rc.7 (AppImage)";
+      aboutEl.style.fontSize = "12px";
+      aboutEl.style.color = "var(--text-muted)";
+      aboutEl.classList.add("dirscordScreenaudioAboutText");
+      el.appendChild(aboutEl);
+    }
  }

-  function updateSvg() {
-    if (enabled) setSvgEnabled();
-    else setSvgDisabled();
-  }
-
-  container.addEventListener("click", () => {
-    enabled = !enabled;
-    updateSvg();
-    onClick(enabled);
-  });
-  updateSvg();
-
-  return container;
-}
+  // Remove stream settings if stream is active
+  document.getElementById("manage-streams-change-windows")?.remove();
+  document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
+}, 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);
-}
--- a/assets/vencord/VencordNativeStub.ts
+++ b/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);
-    },
-  },
-};
--- a/assets/vencord/plugin.js
+++ b/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: [],
-});
--- a/assets/vencord/settings.patch
+++ b/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>
--- a/assets/vencord/vencord.js
+++ b/assets/vencord/vencord.js
--- a/resources.qrc
+++ b/resources.qrc
@@ -2,7 +2,5 @@
 <RCC>
  <qresource>
    <file>assets/userscript.js</file>
-    <file>assets/vencord/vencord.js</file>
-    <file>assets/de.shorsh.discord-screenaudio.png</file>
  </qresource>
 </RCC>
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -0,0 +1,4 @@
+FROM debian:11
+ADD ./prepare-container.sh /tmp/prepare-container.sh
+RUN /tmp/prepare-container.sh
+WORKDIR /work
--- a/scripts/build-appimage.sh
+++ b/scripts/build-appimage.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/bash
+
+set -e
+
+# Check if inside of docker container
+if [ ! -f /.dockerenv ]; then
+  # Check if docker is available
+  if ! command -v docker >/dev/null 2>&1; then
+    echo "Error: Docker is not available."
+    exit 1
+  fi
+  docker run --rm -u $(id -u) -v "$PWD":/work discord-screenaudio-buildenv bash /work/scripts/build-appimage.sh
+  exit 0
+fi
+
+tmpdir="$(mktemp -d)"
+builddir="$tmpdir/build"
+appdir="$tmpdir/AppDir"
+export CMAKE_GENERATOR="Ninja"
+cmake -B "$builddir" -S "$PWD"
+cmake --build "$builddir" --config Release
+DESTDIR="$appdir" cmake --install "$builddir" --prefix "/usr"
+# Include libnss related files
+mkdir -p "$appdir/AppDir/usr/lib/"
+cp -rv "/usr/lib/x86_64-linux-gnu/nss" "$appdir/usr/lib/"
+
+VERSION="$(cat version)" linuxdeploy \
+  --appdir "$appdir" \
+  --icon-file "assets/discord.png" \
+  --plugin qt \
+  --exclude-library "libpipewire-0.3.so.0" \
+  --output appimage
--- a/scripts/build_vencord.sh
+++ b/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
--- a/scripts/prepare-container.sh
+++ b/scripts/prepare-container.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+cd "$(dirname "$0")"
+
+if [ ! -f /.dockerenv ]; then
+  # Check if docker is available
+  if ! command -v docker >/dev/null 2>&1; then
+    echo "Error: Docker is not available."
+    exit 1
+  fi
+  docker build -t discord-screenaudio-buildenv .
+  exit 0
+fi
+
+echo "-> Installing dependencies with apt..."
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y curl build-essential qtbase5-dev qtwebengine5-dev qt5-qmake cmake ninja-build pkg-config git libpipewire-0.3-dev file
+
+echo "-> Installing linuxdeploy..."
+tmpdir="$(mktemp -d)"
+install_appimage() {
+  curl -Lo "$tmpdir/$1.AppImage" "$2"
+  chmod +x "$tmpdir/$1.AppImage"
+  sed '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' -i -i "$tmpdir/$1.AppImage"
+  (cd "$tmpdir" && ./$1.AppImage --appimage-extract)
+  mv -v "$tmpdir/squashfs-root" "/opt/$1"
+  ln -sv "/opt/$1/AppRun" "/usr/local/bin/$1"
+}
+install_appimage "linuxdeploy" "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+install_appimage "linuxdeploy-plugin-qt" "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
+
+echo "-> Cleaning up..."
+rm -rf "$tmpdir"
+rm /tmp/prepare-container.sh
+apt-get clean
--- a/src/discordpage.cpp
+++ b/src/discordpage.cpp
@@ -1,14 +1,9 @@
 #include "discordpage.h"
-#include "log.h"
-#include "mainwindow.h"
 #include "virtmic.h"

 #include <QApplication>
 #include <QDesktopServices>
 #include <QFile>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QNetworkReply>
 #include <QTimer>
 #include <QWebChannel>
 #include <QWebEngineScript>
@@ -17,40 +12,11 @@

 DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
  setBackgroundColor(QColor("#202225"));
+  m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);

  connect(this, &QWebEnginePage::featurePermissionRequested, this,
          &DiscordPage::featurePermissionRequested);

-  setupPermissions();
-
-  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,
@@ -61,60 +27,35 @@ void DiscordPage::setupPermissions() {
  settings()->setAttribute(QWebEngineSettings::PlaybackRequiresUserGesture,
                           false);
  settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
-  settings()->setAttribute(QWebEngineSettings::ScrollAnimatorEnabled, true);
+
+  setUrl(QUrl("https://discord.com/app"));
+
+  injectScript(":/assets/userscript.js");
+
+  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 source) {
+  qDebug() << "[main   ] Injecting" << source;

-void DiscordPage::injectScript(
-    QString name, QString content,
-    QWebEngineScript::InjectionPoint injectionPoint) {
-  qDebug(mainLog) << "Injecting " << name;
+  QFile userscript(source);

-  QWebEngineScript script;
-
-  script.setSourceCode(content);
-  script.setName(name);
-  script.setWorldId(QWebEngineScript::MainWorld);
-  script.setInjectionPoint(injectionPoint);
-  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) {
-  QFile file(source);
-
-  if (!file.open(QIODevice::ReadOnly)) {
+  if (!userscript.open(QIODevice::ReadOnly)) {
    qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
-           file.errorString().toLatin1().constData());
+           userscript.errorString().toLatin1().constData());
  } else {
-    (this->*inject)(name, file.readAll());
+    QByteArray userscriptJs = userscript.readAll();
+
+    QWebEngineScript script;
+
+    script.setSourceCode(userscriptJs);
+    script.setName("userscript.js");
+    script.setWorldId(QWebEngineScript::MainWorld);
+    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
+    script.setRunsOnSubFrames(false);
+
+    scripts().insert(script);
  }
 }

@@ -125,10 +66,11 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
                       QWebEnginePage::PermissionGrantedByUser);

  if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
-    if (!m_userScript.isVirtmicRunning()) {
-      qDebug(virtmicLog) << "Starting Virtmic with no target to make sure "
-                            "Discord can find all the audio devices";
-      m_userScript.startVirtmic("None");
+    if (m_virtmicProcess.state() == QProcess::NotRunning) {
+      qDebug() << "[virtmic] Starting Virtmic with no target to make sure "
+                  "Discord can find all the audio devices";
+      m_virtmicProcess.start(QApplication::arguments()[0],
+                             {"--virtmic", "None"});
    }
  }
 }
@@ -136,10 +78,10 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
 bool DiscordPage::acceptNavigationRequest(const QUrl &url,
                                          QWebEnginePage::NavigationType type,
                                          bool isMainFrame) {
-  if (type == QWebEnginePage::NavigationTypeLinkClicked) {
-    QDesktopServices::openUrl(url);
-    return false;
-  }
+  // if (type == QWebEnginePage::NavigationTypeLinkClicked) {
+  //   QDesktopServices::openUrl(url);
+  //   return false;
+  // }
  return true;
 };

@@ -155,81 +97,46 @@ 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() << "[virtmic] Stopping Virtmic";
+    m_virtmicProcess.kill();
+    m_virtmicProcess.waitForFinished();
+  }
+}
+
+void DiscordPage::startVirtmic(QString target) {
+  if (target != "None") {
+    qDebug() << "[virtmic] 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 {
+    qDebug() << "[discord]" << 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));
+  });
+}
--- a/src/discordpage.h
+++ b/src/discordpage.h
@@ -1,12 +1,11 @@
 #pragma once

 #include "streamdialog.h"
-#include "userscript.h"
 #include "virtmic.h"

+#include <QProcess>
 #include <QWebEngineFullScreenRequest>
 #include <QWebEnginePage>
-#include <QWebEngineScript>

 class DiscordPage : public QWebEnginePage {
  Q_OBJECT
@@ -15,9 +14,8 @@ public:
  explicit DiscordPage(QWidget *parent = nullptr);

 private:
-  UserScript m_userScript;
-  void setupPermissions();
-  void setupUserStyles();
+  StreamDialog m_streamDialog;
+  QProcess m_virtmicProcess;
  bool acceptNavigationRequest(const QUrl &url,
                               QWebEnginePage::NavigationType type,
                               bool isMainFrame) override;
@@ -26,16 +24,14 @@ 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 injectScript(QString source);
+  void stopVirtmic();
+  void startVirtmic(QString target);

 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
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,7 +0,0 @@
-#include "log.h"
-
-Q_LOGGING_CATEGORY(mainLog, "main");
-Q_LOGGING_CATEGORY(discordLog, "discord");
-Q_LOGGING_CATEGORY(userscriptLog, "userscript");
-Q_LOGGING_CATEGORY(virtmicLog, "virtmic");
-Q_LOGGING_CATEGORY(shortcutLog, "shortcut");
--- a/src/log.h
+++ b/src/log.h
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <QLoggingCategory>
-
-Q_DECLARE_LOGGING_CATEGORY(mainLog);
-Q_DECLARE_LOGGING_CATEGORY(discordLog);
-Q_DECLARE_LOGGING_CATEGORY(userscriptLog);
-Q_DECLARE_LOGGING_CATEGORY(virtmicLog);
-Q_DECLARE_LOGGING_CATEGORY(shortcutLog);
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,23 +1,13 @@
 #include "mainwindow.h"
 #include "virtmic.h"

-#ifdef KXMLGUI
-#include <KAboutData>
-#endif
-
 #include <QApplication>
 #include <QCommandLineParser>
-#include <QLoggingCategory>

 int main(int argc, char *argv[]) {
  QApplication app(argc, argv);
  QApplication::setApplicationName("discord-screenaudio");
-  QApplication::setWindowIcon(
-      QIcon(":assets/de.shorsh.discord-screenaudio.png"));
-  QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
-  QApplication::setDesktopFileName("de.shorsh.discord-screenaudio");
-
-  qSetMessagePattern("[%{category}] %{message}");
+  QApplication::setApplicationVersion("1.0.0-rc.7");

  QCommandLineParser parser;
  parser.setApplicationDescription(
@@ -27,29 +17,17 @@ int main(int argc, char *argv[]) {
  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);
-  QCommandLineOption notifySendOption(
-      "notify-send", "Use notify-send instead of QT/KF5 notifications");
-  parser.addOption(notifySendOption);
-
+#ifdef DEBUG
+  parser.addOption(QCommandLineOption(
+      "remote-debugging-port", "Chromium Remote Debugging Port", "port"));
+#endif
  parser.process(app);

  if (parser.isSet(virtmicOption)) {
    Virtmic::start(parser.value(virtmicOption));
  }

-  qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
-          "--enable-features=WebRTCPipeWireCapturer " +
-              qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
-
-  if (parser.isSet(degubOption))
-    qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
-            "--remote-debugging-port=9222 " +
-                qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
-
-  MainWindow w(parser.isSet(notifySendOption));
+  MainWindow w;
  w.show();

  return app.exec();
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,10 +1,6 @@
 #include "mainwindow.h"
 #include "virtmic.h"

-#ifdef KNOTIFICATIONS
-#include <KNotification>
-#endif
-
 #include <QApplication>
 #include <QColor>
 #include <QComboBox>
@@ -14,32 +10,16 @@
 #include <QPushButton>
 #include <QSpacerItem>
 #include <QThread>
-#include <QTimer>
 #include <QUrl>
-#include <QWebEngineNotification>
-#include <QWebEngineProfile>
 #include <QWebEngineScript>
 #include <QWebEngineScriptCollection>
 #include <QWebEngineSettings>
 #include <QWidget>

-MainWindow *MainWindow::m_instance = nullptr;
-
-MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
-    : QMainWindow(parent) {
-  assert(MainWindow::m_instance == nullptr);
-  MainWindow::m_instance = this;
-  m_useNotifySend = useNotifySend;
-  setupSettings();
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
  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,38 +30,6 @@ 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();
-#endif
-          }
-        });
-
  setCentralWidget(m_webView);
 }

@@ -96,72 +44,4 @@ 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();
-}
-
-MainWindow *MainWindow::instance() { return m_instance; }
+void MainWindow::closeEvent(QCloseEvent *event) { QApplication::quit(); }
--- a/src/mainwindow.h
+++ b/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,15 @@ class MainWindow : public QMainWindow {
  Q_OBJECT

 public:
-  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
-  static MainWindow *instance();
-  QSettings *settings() const;
+  explicit MainWindow(QWidget *parent = nullptr);

 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);
--- a/src/streamdialog.cpp
+++ b/src/streamdialog.cpp
@@ -9,109 +9,70 @@
 #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);

-    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);
+  m_targetComboBox = new QComboBox(this);
+  updateTargets();
+  layout->addWidget(m_targetComboBox);

-      auto resolutionLabel = new QLabel(this);
-      resolutionLabel->setText("Resolution");
-      videoLayout->addWidget(resolutionLabel);
+  auto qualityLabel = new QLabel(this);
+  qualityLabel->setText("Stream Quality");
+  layout->addWidget(qualityLabel);

-      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 qualityHBox = new QHBoxLayout(this);
+  layout->addLayout(qualityHBox);

-      auto framerateLabel = new QLabel(this);
-      framerateLabel->setText("Framerate");
-      videoLayout->addWidget(framerateLabel);
+  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);

-      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);
-    }
+  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);

-    m_audioGroupBox = new QGroupBox(this);
-    m_audioGroupBox->setCheckable(true);
-    m_audioGroupBox->setTitle("Audio");
-    layout->addWidget(m_audioGroupBox);
+  auto button = new QPushButton(this);
+  button->setText("Start Stream");
+  connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
+  layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);

-    {
-      auto audioLayout = new QVBoxLayout(m_audioGroupBox);
-
-      auto targetLabel = new QLabel(this);
-      targetLabel->setText("Audio Source");
-      audioLayout->addWidget(targetLabel);
-
-      {
-        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");
+  setFixedSize(0, 0);
 }

 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);
 }

 void StreamDialog::updateTargets() {
-  auto lastTarget = m_targetComboBox->currentText();
-
  m_targetComboBox->clear();
-  m_targetComboBox->addItem("[All Desktop Audio]");
+  m_targetComboBox->addItem("None");
  for (auto target : Virtmic::getTargets()) {
    m_targetComboBox->addItem(target);
  }
-
-  if (m_targetComboBox->findText(lastTarget) != -1)
-    m_targetComboBox->setCurrentText(lastTarget);
-  else
-    m_targetComboBox->setCurrentText("[All Desktop Audio]");
 }
--- a/src/streamdialog.h
+++ b/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();
--- a/src/userscript.cpp
+++ b/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);
-}
--- a/src/userscript.h
+++ b/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);
-};
--- a/src/virtmic.cpp
+++ b/src/virtmic.cpp
@@ -1,13 +1,10 @@
 #include "virtmic.h"
-#include "log.h"

 #include <rohrkabel/loop/main.hpp>
 #include <rohrkabel/registry/registry.hpp>

 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);
@@ -22,17 +19,11 @@ 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"]);

-          if (name != "" && !EXCLUDE_TARGETS.contains(name) &&
-              !targets.contains(name)) {
-            targets.append(name);
+          if (info.props.count("node.name")) {
+            auto name = QString::fromStdString(info.props["node.name"]);
+            if (!targets.contains(name))
+              targets.append(name);
          }
        }
      });
@@ -73,28 +64,20 @@ 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"];

-      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();
+      if (parent.props["node.name"].find(target) != std::string::npos) {
+        std::cout << "[virtmic] "
+                  << "Link   : " << target << ":" << port_id << " -> ";
+
+        if (port.info().props["audio.channel"] == "FL") {
+          links.emplace(port_id, core.create<pipewire::link_factory>(
+                                     {virt_fl->info().id, port_id}));
+          std::cout << "[virtmic] " << virt_fl->info().id << std::endl;
+        } else {
+          links.emplace(port_id, core.create<pipewire::link_factory>(
+                                     {virt_fr->info().id, port_id}));
+          std::cout << "[virtmic] " << virt_fr->info().id << std::endl;
+        }
      }
    }
  };
@@ -110,7 +93,7 @@ void start(QString _target) {
                                 pipewire::node::type, pipewire::node::version,
                                 pipewire::update_strategy::none);

-  if (target == "[None]") {
+  if (target == "None") {
    while (true) {
      main_loop.run();
    }
@@ -122,19 +105,9 @@ 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
-            return;
-          qDebug(virtmicLog) << QString("Added: %1")
-                                    .arg(QString::fromStdString(name))
-                                    .toUtf8()
-                                    .data();
+          std::cout << "[virtmic] "
+                    << "Added  : " << node.info().props["node.name"]
+                    << std::endl;

          if (!nodes.count(global.id)) {
            nodes.emplace(global.id, node.info());
@@ -168,16 +141,8 @@ 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))
-                                    .toUtf8()
-                                    .data();
+          std::cout << "[virtmic] "
+                    << "Removed: " << info.props["node.name"] << std::endl;
          nodes.erase(id);
        }
        if (ports.count(id)) {
--- a/1
+++ b/1
@@ -0,0 +1 @@
+v1.0.0-rc.7
--- a/version.cmake
+++ b/version.cmake
@@ -1,164 +0,0 @@
-# Copyright (c) 2018-2021 Ribose Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# desired length of commit hash
-set(GIT_REV_LEN 7)
-
-# call git, store output in var (can fail)
-macro(_git var)
-  execute_process(
-    COMMAND "${GIT_EXECUTABLE}" ${ARGN}
-    WORKING_DIRECTORY "${source_dir}"
-    RESULT_VARIABLE _git_ec
-    OUTPUT_VARIABLE ${var}
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-  )
-endmacro()
-
-function(extract_version_info version var_prefix)
-  # extract the main components
-  #   v1.9.0-3-g5b92266+1546836556
-  #   v1.9.0-3-g5b92266-dirty+1546836556
-  string(REGEX MATCH "^v?([0-9]+\\.[0-9]+\\.[0-9]+)(-([0-9]+)-g([0-9a-f]+)(-dirty)?)?(\\+([0-9]+))?$" matches "${version}")
-  if (NOT matches)
-    message(FATAL_ERROR "Failed to extract version components from ${version}.")
-  endif()
-  set(${var_prefix}_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) # 1.9.0
-  if (NOT CMAKE_MATCH_3)
-    set(CMAKE_MATCH_3 "0")
-  endif()
-  set(${var_prefix}_VERSION_NCOMMITS "${CMAKE_MATCH_3}" PARENT_SCOPE) # 3
-  if (NOT CMAKE_MATCH_4)
-    set(CMAKE_MATCH_4 "0")
-  endif()
-  set(${var_prefix}_VERSION_GIT_REV "${CMAKE_MATCH_4}" PARENT_SCOPE) # 5b92266
-  if (CMAKE_MATCH_5 STREQUAL "-dirty")
-    set(${var_prefix}_VERSION_IS_DIRTY TRUE PARENT_SCOPE)
-  else()
-    set(${var_prefix}_VERSION_IS_DIRTY FALSE PARENT_SCOPE)
-  endif()
-  # timestamp is optional, default to 0
-  if (NOT CMAKE_MATCH_7)
-    set(CMAKE_MATCH_7 "0")
-  endif()
-  set(${var_prefix}_VERSION_COMMIT_TIMESTAMP "${CMAKE_MATCH_7}" PARENT_SCOPE) # 1546836556
-endfunction()
-
-function(determine_version source_dir var_prefix)
-  set(has_release_tag NO)
-  set(has_version_txt NO)
-  set(local_prefix "_determine_ver")
-  # find out base version via version.txt
-  set(base_version "0.0.0")
-  if (EXISTS "${source_dir}/version.txt")
-    set(has_version_txt YES)
-    file(STRINGS "${source_dir}/version.txt" version_file)
-    extract_version_info("${version_file}" "${local_prefix}")
-    set(base_version "${${local_prefix}_VERSION}")
-    message(STATUS "Found version.txt with ${version_file}")
-  else()
-    message(STATUS "Found no version.txt.")
-  endif()
-  # for GIT_EXECUTABLE
-  find_package(Git)
-  # get a description of the version, something like:
-  #   v1.9.1-0-g38ffe82        (a tagged release)
-  #   v1.9.1-0-g38ffe82-dirty  (a tagged release with local modifications)
-  #   v1.9.0-3-g5b92266        (post-release snapshot)
-  #   v1.9.0-3-g5b92266-dirty  (post-release snapshot with local modifications)
-  _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty)
-  if (NOT _git_ec EQUAL 0)
-    # no annotated tags, fake one
-    message(STATUS "Found no annotated tags.")
-    _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD)
-    if (_git_ec EQUAL 0)
-      set(version "v${base_version}-0-g${revision}")
-      # check if dirty (this won't detect untracked files, but should be ok)
-      _git(changes diff-index --quiet HEAD --)
-      if (NOT _git_ec EQUAL 0)
-        string(APPEND version "-dirty")
-      endif()
-      # append the commit timestamp of the most recent commit (only
-      # in non-release branches -- typically master)
-      _git(commit_timestamp show -s --format=%ct)
-      if (_git_ec EQUAL 0)
-        string(APPEND version "+${commit_timestamp}")
-      endif()
-    elseif(has_version_txt)
-      # Nothing to get from git - so use version.txt completely
-      set(version "${version_file}")
-    else()
-      # Sad case - no git, no version.txt
-      set(version "v${base_version}")
-    endif()
-  else()
-    set(has_release_tag YES)
-    message(STATUS "Found annotated tag ${version}")
-  endif()
-  extract_version_info("${version}" "${local_prefix}")
-  if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION)
-    message(WARNING "Tagged version ${${local_prefix}_VERSION} doesn't match one from the version.txt: ${base_version}")
-    if (${base_version} VERSION_GREATER ${local_prefix}_VERSION)
-      set(${local_prefix}_VERSION ${base_version})
-    endif()
-  endif()
-  foreach(suffix VERSION VERSION_NCOMMITS VERSION_GIT_REV VERSION_IS_DIRTY VERSION_COMMIT_TIMESTAMP)
-    if (NOT DEFINED ${local_prefix}_${suffix})
-      message(FATAL_ERROR "Unable to determine version.")
-    endif()
-    set(${var_prefix}_${suffix} "${${local_prefix}_${suffix}}" PARENT_SCOPE)
-    message(STATUS "${var_prefix}_${suffix}: ${${local_prefix}_${suffix}}")
-  endforeach()
-  # Set VERSION_SUFFIX and VERSION_FULL. When making changes, be aware that
-  # this is used in packaging as well and will affect ordering.
-  # | state                 | version_full                |
-  # |-----------------------------------------------------|
-  # | exact tag             | 0.9.0                       |
-  # | exact tag, dirty      | 0.9.0+git20180604           |
-  # | after tag             | 0.9.0+git20180604.1.085039f |
-  # | no tag, version.txt   | 0.9.0                       |
-  # | no tag, no version.txt| 0.0.0+git20180604.2ee02af   |
-  string(TIMESTAMP date "%Y%m%d" UTC)
-  set(version_suffix "")
-  if (has_version_txt)
-  elseif (NOT ${local_prefix}_VERSION_NCOMMITS EQUAL 0)
-    # 0.9.0+git20150604.4.289818b
-    string(APPEND version_suffix "+git${date}.${${local_prefix}_VERSION_NCOMMITS}.${${local_prefix}_VERSION_GIT_REV}")
-  elseif ((NOT has_release_tag) AND ((NOT has_version_txt) OR ("${base_version}" STREQUAL "0.0.0") OR (NOT "${revision}" STREQUAL "")))
-    # 0.9.0+git20150604.289818b
-    string(APPEND version_suffix "+git${date}.${${local_prefix}_VERSION_GIT_REV}")
-  elseif(${local_prefix}_VERSION_IS_DIRTY)
-    # 0.9.0+git20150604
-    string(APPEND version_suffix "+git${date}")
-  endif()
-  set(version_full "${${local_prefix}_VERSION}${version_suffix}")
-  # set the results
-  set(${var_prefix}_VERSION_SUFFIX "${version_suffix}" PARENT_SCOPE)
-  set(${var_prefix}_VERSION_FULL "${version_full}" PARENT_SCOPE)
-  # for informational purposes
-  message(STATUS "${var_prefix}_VERSION_SUFFIX: ${version_suffix}")
-  message(STATUS "${var_prefix}_VERSION_FULL: ${version_full}")
-endfunction()
-
Author	SHA1	Message	Date
Malte Jürgens	092fbf72b6	bump version	2022-07-27 21:25:24 +02:00
Malte Jürgens	4d3e77bc9a	Merge branch 'master' into appimage	2022-07-27 21:24:54 +02:00
Malte Jürgens	ae57550b46	Merge branch 'master' into appimage	2022-07-27 20:45:16 +02:00
Malte Jürgens	6681c0591a	Merge branch 'master' into appimage	2022-07-17 19:43:36 +02:00
Malte Jürgens	8597416bb5	still not working	2022-07-16 22:28:16 +02:00
Malte Jürgens	ce94b44997	almost working	2022-07-16 22:03:33 +02:00
Malte Jürgens	2741e1afaa	muh working	2022-07-16 20:41:26 +02:00
Malte Jürgens	b2f5f8e7d0	not working but better	2022-07-16 19:09:11 +02:00
Malte Jürgens	c4c32b1615	it doesnt work	2022-07-13 22:00:30 +02:00