fix keybinds query selector

This reverts commit b0a8815bb8.

.gitignore

@@ -1 +1,2 @@
 /build
+.vscode

CMakeLists.txt

@@ -13,15 +13,27 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 string(TIMESTAMP TIMESTAMP %s)
 # set(CMAKE_AUTOUIC ON)
 
-find_package(Qt5 CONFIG REQUIRED COMPONENTS 
+find_package(Qt5 COMPONENTS Widgets)
-  Widgets
+if (Qt5_FOUND)
-  WebEngineWidgets
+  find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
-)
 
-option(KF5NOTIFICATIONS "Use KF5Notifications for enhanced system notifications" ON)
-if(KF5NOTIFICATIONS)
-  add_definitions( -DKF5NOTIFICATIONS )
   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
@@ -30,6 +42,7 @@ set(discord-screenaudio_SRC
   src/virtmic.cpp
   src/discordpage.cpp
   src/streamdialog.cpp
+  src/log.cpp
   resources.qrc
 )
 
@@ -56,12 +69,18 @@ add_subdirectory(submodules/rohrkabel)
 
 add_executable(discord-screenaudio ${discord-screenaudio_SRC})
 
-target_link_libraries(discord-screenaudio Qt5::Widgets Qt5::WebEngineWidgets rohrkabel)
+target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel)
 
-if(KF5NOTIFICATIONS)
+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 discord-screenaudio DESTINATION bin)
 install(FILES assets/de.shorsh.discord-screenaudio.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)

README.md

@@ -1,13 +1,17 @@
 # discord-screenaudio
 
-A very WIP custom discord client that supports streaming with audio on Linux,
+A custom discord client that supports streaming with audio on Linux, made
-made possible by the
+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).
 
-![Screenshot_20220718_194357](https://user-images.githubusercontent.com/48161361/179571245-11ea05f3-fb5e-4aef-9132-2736e122ef04.png)
+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)
 
 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
@@ -23,8 +27,9 @@ 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)
+- Can only share primary screen on X11 (no other screens or specific
-  (see [#1](https://github.com/maltejur/discord-screenaudio/issues/1))
+  applications) (see
+  [#1](https://github.com/maltejur/discord-screenaudio/issues/1))
 
 ## Installation
 
@@ -36,7 +41,7 @@ You have multiple options:
   [`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=home%3AVortexAcherontic&package=discord-screenaudio)
+  [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)
 
@@ -45,13 +50,17 @@ 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, QtWebEngine and Kf5Notifications
+- Qt5 and QtWebEngine
 - **PipeWire** (it currently doesn't work with PulseAudio)
 - Git
+- _Kf5Notifications (optional, for better notifications)_
+- _KXMLGui and KGlobalAccel (optional, for keybinds)_
 
-On Debian:
+With apt:
-`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev pkg-config libpipewire-0.3-dev git`
+`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev libkf5xmlgui-dev libkf5globalaccel-dev pkg-config libpipewire-0.3-dev git`
 
 ### Building
 

assets/de.shorsh.discord-screenaudio.desktop

@@ -2,5 +2,7 @@
 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

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

@@ -4,15 +4,23 @@
   <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 very WIP custom discord client that supports streaming with audio on Linux</summary>
+  <summary>A custom discord client that supports streaming with audio on Linux</summary>
 
   <description>
-    <p>A very WIP 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>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">
@@ -22,7 +30,7 @@
   <screenshots>
     <screenshot type="default">
       <image>
-        https://user-images.githubusercontent.com/48161361/179571245-11ea05f3-fb5e-4aef-9132-2736e122ef04.png
+        https://user-images.githubusercontent.com/48161361/192137080-33466cf7-8c56-4373-90c6-01ea74b6fb83.png
       </image>
     </screenshot>
   </screenshots>

assets/userscript.js

@@ -3,16 +3,29 @@
 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();
-  let audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
+    audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
+    if (!audioDevice)
+      console.log(
+        `dsa: Did not find '${nameOfAudioDevice}', trying again in 100ms`
+      );
+    await sleep(100);
+  }
+  console.log(`dsa: Found '${nameOfAudioDevice}'`);
   return audioDevice;
 };
 
-function setGetDisplayMedia(overrideArgs = undefined) {
+function setGetDisplayMedia(video = true, overrideArgs = undefined) {
   const getDisplayMedia = async (...args) => {
     var id;
     try {
@@ -50,6 +63,7 @@ function setGetDisplayMedia(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;
@@ -98,8 +112,16 @@ setInterval(() => {
 
       const initialDisplay = el.style.display;
 
-      window.discordScreenaudioStartStream = (width, height, frameRate) => {
+      window.discordScreenaudioStartStream = (
-        setGetDisplayMedia({
+        video,
+        width,
+        height,
+        frameRate
+      ) => {
+        window.discordScreenaudioResolutionString = video
+          ? `${height}p ${frameRate}FPS`
+          : "Audio Only";
+        setGetDisplayMedia(video, {
           audio: true,
           video: { width, height, frameRate },
         });
@@ -121,12 +143,21 @@ setInterval(() => {
     document.getElementsByClassName("dirscordScreenaudioAboutText").length == 0
   ) {
     for (const el of document.getElementsByClassName("info-3pQQBb")) {
-      const aboutEl = document.createElement("div");
+      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);
     }
   }
@@ -134,6 +165,62 @@ setInterval(() => {
   // 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";
+    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);
+  }
+
+  const buttonContainer =
+    document.getElementsByClassName("container-YkUktl")[0];
+  if (!buttonContainer) {
+    console.log(
+      "dsa: Cannot locate Mute/Deafen/Settings button container, please report this on GitHub"
+    );
+  }
+
+  const muteBtn = buttonContainer
+    ? buttonContainer.getElementsByClassName(
+        "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+      )[0]
+    : null;
+  window.discordScreenaudioToggleMute = () => muteBtn && muteBtn.click();
+
+  const deafenBtn = buttonContainer
+    ? buttonContainer.getElementsByClassName(
+        "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
+      )[1]
+    : null;
+
+  window.discordScreenaudioToggleDeafen = () => deafenBtn && deafenBtn.click();
+
+  if (window.discordScreenaudioResolutionString) {
+    for (const el of document.getElementsByClassName(
+      "qualityIndicator-39wQDy"
+    )) {
+      el.innerHTML = window.discordScreenaudioResolutionString;
+    }
+  }
 }, 500);
 
 // Fix for broken discord notifications after restart

src/discordpage.cpp

@@ -1,9 +1,26 @@
 #include "discordpage.h"
+#include "log.h"
+#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 <QMessageBox>
+#include <QNetworkReply>
 #include <QTimer>
 #include <QWebChannel>
 #include <QWebEngineScript>
@@ -32,53 +49,96 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
   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");
+  injectScriptFile("userscript.js", ":/assets/userscript.js");
-  injectVersion(QApplication::applicationVersion());
+
+  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::injectScript(QString source) {
+void DiscordPage::injectScriptText(QString name, QString content) {
-  qDebug() << "[main   ] Injecting " << source;
+  qDebug(mainLog) << "Injecting " << name;
 
-  QFile userscript(source);
+  QWebEngineScript script;
 
-  if (!userscript.open(QIODevice::ReadOnly)) {
+  script.setSourceCode(content);
+  script.setName(name);
+  script.setWorldId(QWebEngineScript::MainWorld);
+  script.setInjectionPoint(QWebEngineScript::DocumentCreation);
+  script.setRunsOnSubFrames(false);
+
+  scripts().insert(script);
+}
+
+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(),
-           userscript.errorString().toLatin1().constData());
+           file.errorString().toLatin1().constData());
   } else {
-    QByteArray userscriptJs = userscript.readAll();
+    injectScriptText(name, file.readAll());
-
-    QWebEngineScript script;
-
-    script.setSourceCode(userscriptJs);
-    script.setName("userscript.js");
-    script.setWorldId(QWebEngineScript::MainWorld);
-    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
-    script.setRunsOnSubFrames(false);
-
-    scripts().insert(script);
   }
 }
 
-void DiscordPage::injectVersion(QString version) {
-  QWebEngineScript script;
-
-  auto code = QString("window.discordScreenaudioVersion = '%1';").arg(version);
-
-  script.setSourceCode(code);
-  script.setName("version.js");
-  script.setWorldId(QWebEngineScript::MainWorld);
-  script.setInjectionPoint(QWebEngineScript::DocumentCreation);
-  script.setRunsOnSubFrames(false);
-
-  scripts().insert(script);
-}
-
 void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
                                              QWebEnginePage::Feature feature) {
   // Allow every permission asked
@@ -87,7 +147,7 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
 
   if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
     if (m_virtmicProcess.state() == QProcess::NotRunning) {
-      qDebug() << "[virtmic] Starting Virtmic with no target to make sure "
+      qDebug(virtmicLog) << "Starting Virtmic with no target to make sure "
                             "Discord can find all the audio devices";
       m_virtmicProcess.start(QApplication::arguments()[0],
                              {"--virtmic", "None"});
@@ -119,18 +179,16 @@ QWebEnginePage *DiscordPage::createWindow(QWebEnginePage::WebWindowType type) {
 
 void DiscordPage::stopVirtmic() {
   if (m_virtmicProcess.state() == QProcess::Running) {
-    qDebug() << "[virtmic] Stopping Virtmic";
+    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;
-    qDebug() << "[virtmic] Starting Virtmic with target" << target;
   m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
 }
-}
 
 void DiscordPage::javaScriptConsoleMessage(
     QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
@@ -143,20 +201,54 @@ void DiscordPage::javaScriptConsoleMessage(
     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() << "[discord]" << message;
+    qDebug(discordLog) << message;
   }
 }
 
-void DiscordPage::startStream(QString target, uint width, uint height,
+void DiscordPage::startStream(bool video, bool audio, uint width, uint height,
-                              uint frameRate) {
+                              uint frameRate, QString target) {
   stopVirtmic();
-  startVirtmic(target);
+  startVirtmic(audio ? target : "[None]");
   // Wait a bit for the virtmic to start
-  QTimer::singleShot(target == "None" ? 0 : 200, [=]() {
+  QTimer::singleShot(200, [=]() {
-    runJavaScript(QString("window.discordScreenaudioStartStream(%1, %2, %3);")
+    runJavaScript(
-                      .arg(width)
+        QString("window.discordScreenaudioStartStream(%1, %2, %3, %4);")
-                      .arg(height)
+            .arg(video)
-                      .arg(frameRate));
+            .arg(video ? width : 32)
+            .arg(video ? height : 16)
+            .arg(video ? frameRate : 1));
   });
 }
+
+void DiscordPage::toggleMute() {
+  qDebug(shortcutLog) << "Toggling mute";
+  runJavaScript("window.discordScreenaudioToggleMute();");
+}
+
+void DiscordPage::toggleDeafen() {
+  qDebug(shortcutLog) << "Toggling deafen";
+  runJavaScript("window.discordScreenaudioToggleDeafen();");
+}

src/discordpage.h

@@ -3,6 +3,12 @@
 #include "streamdialog.h"
 #include "virtmic.h"
 
+#ifdef KXMLGUI
+#include <KActionCollection>
+#include <KHelpMenu>
+#include <KShortcutsDialog>
+#endif
+
 #include <QProcess>
 #include <QWebEngineFullScreenRequest>
 #include <QWebEnginePage>
@@ -16,6 +22,13 @@ public:
 private:
   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;
@@ -24,15 +37,18 @@ private:
   javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
                            const QString &message, int lineNumber,
                            const QString &sourceID) override;
-  void injectScript(QString source);
+  void injectScriptText(QString name, QString content);
-  void injectVersion(QString version);
+  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);
+  void startStream(bool video, bool audio, uint width, uint height,
+                   uint frameRate, QString target);
 };
 
 // Will immediately get destroyed again but is needed for navigation to

src/log.cpp

@@ -0,0 +1,7 @@
+#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");

src/log.h

@@ -0,0 +1,9 @@
+#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);

src/main.cpp

@@ -1,8 +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);
@@ -12,6 +17,8 @@ int main(int argc, char *argv[]) {
   QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
   QApplication::setDesktopFileName("de.shorsh.discord-screenaudio");
 
+  qSetMessagePattern("[%{category}] %{message}");
+
   QCommandLineParser parser;
   parser.setApplicationDescription(
       "Custom Discord client with the ability to stream audio on Linux");
@@ -20,10 +27,13 @@ int main(int argc, char *argv[]) {
   QCommandLineOption virtmicOption("virtmic", "Start the Virtual Microphone",
                                    "target");
   parser.addOption(virtmicOption);
-#ifdef DEBUG
+  QCommandLineOption degubOption("remote-debugging",
-  parser.addOption(QCommandLineOption(
+                                 "Open Chromium Remote Debugging on port 9222");
-      "remote-debugging-port", "Chromium Remote Debugging Port", "port"));
+  parser.addOption(degubOption);
-#endif
+  QCommandLineOption notifySendOption(
+      "notify-send", "Use notify-send instead of QT/KF5 notifications");
+  parser.addOption(notifySendOption);
+
   parser.process(app);
 
   if (parser.isSet(virtmicOption)) {
@@ -34,7 +44,12 @@ int main(int argc, char *argv[]) {
           "--enable-features=WebRTCPipeWireCapturer " +
               qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
 
-  MainWindow w;
+  if (parser.isSet(degubOption))
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
+            "--remote-debugging-port=9222 " +
+                qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
+
+  MainWindow w(parser.isSet(notifySendOption));
   w.show();
 
   return app.exec();

src/mainwindow.cpp

@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "virtmic.h"
 
-#ifdef KF5NOTIFICATIONS
+#ifdef KNOTIFICATIONS
 #include <KNotification>
 #endif
 
@@ -22,7 +22,13 @@
 #include <QWebEngineSettings>
 #include <QWidget>
 
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
+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;
   setupWebView();
   resize(1000, 700);
   showMaximized();
@@ -36,13 +42,26 @@ void MainWindow::setupWebView() {
   m_webView = new QWebEngineView(this);
   m_webView->setPage(page);
 
-#ifdef KF5NOTIFICATIONS
+  if (m_useKF5Notifications || m_useNotifySend)
     QWebEngineProfile::defaultProfile()->setNotificationPresenter(
         [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
-        KNotification *notification = new KNotification("discordNotification");
+          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->setPixmap(
+                QPixmap::fromImage(notificationInfo->icon()));
             notification->setDefaultAction("View");
             connect(notification, &KNotification::defaultActivated,
                     [&, notificationInfo = std::move(notificationInfo)]() {
@@ -50,8 +69,9 @@ void MainWindow::setupWebView() {
                       activateWindow();
                     });
             notification->sendEvent();
-      });
 #endif
+          }
+        });
 
   setCentralWidget(m_webView);
 }
@@ -68,3 +88,5 @@ void MainWindow::fullScreenRequested(
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) { QApplication::quit(); }
+
+MainWindow *MainWindow::instance() { return m_instance; }

src/mainwindow.h

@@ -14,7 +14,8 @@ class MainWindow : public QMainWindow {
   Q_OBJECT
 
 public:
-  explicit MainWindow(QWidget *parent = nullptr);
+  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
+  static MainWindow *instance();
 
 private:
   void setupWebView();
@@ -23,6 +24,13 @@ private:
   DiscordPage *m_discordPage;
   void closeEvent(QCloseEvent *event) override;
   bool m_wasMaximized;
+  static MainWindow *m_instance;
+  bool m_useNotifySend;
+#ifdef KNOTIFICATIONS
+  bool m_useKF5Notifications = true;
+#else
+  bool m_useKF5Notifications = false;
+#endif
 
 private Q_SLOTS:
   void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);

src/streamdialog.cpp

@@ -12,43 +12,77 @@
 StreamDialog::StreamDialog() : QWidget() {
   setAttribute(Qt::WA_QuitOnClose, false);
 
+  {
     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 videoLayout = new QVBoxLayout(this);
+      m_videoGroupBox->setLayout(videoLayout);
+
+      auto resolutionLabel = new QLabel(this);
+      resolutionLabel->setText("Resolution");
+      videoLayout->addWidget(resolutionLabel);
+
+      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 framerateLabel = new QLabel(this);
+      framerateLabel->setText("Framerate");
+      videoLayout->addWidget(framerateLabel);
+
+      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_audioGroupBox = new QGroupBox(this);
+    m_audioGroupBox->setCheckable(true);
+    m_audioGroupBox->setTitle("Audio");
+    layout->addWidget(m_audioGroupBox);
+
+    {
+      auto audioLayout = new QVBoxLayout(this);
+      m_audioGroupBox->setLayout(audioLayout);
+
       auto targetLabel = new QLabel(this);
-  targetLabel->setText("Which app do you want to stream sound from?");
+      targetLabel->setText("Audio Source");
-  layout->addWidget(targetLabel);
+      audioLayout->addWidget(targetLabel);
+
+      {
+        auto targetLayout = new QHBoxLayout(this);
+        audioLayout->addLayout(targetLayout);
 
         m_targetComboBox = new QComboBox(this);
         updateTargets();
-  layout->addWidget(m_targetComboBox);
+        targetLayout->addWidget(m_targetComboBox);
 
-  auto qualityLabel = new QLabel(this);
+        auto refreshTargetsButton = new QPushButton(this);
-  qualityLabel->setText("Stream Quality");
+        refreshTargetsButton->setFixedSize(30, 30);
-  layout->addWidget(qualityLabel);
+        refreshTargetsButton->setIcon(QIcon::fromTheme("view-refresh"));
-
+        connect(refreshTargetsButton, &QPushButton::clicked, this,
-  auto qualityHBox = new QHBoxLayout(this);
+                &StreamDialog::updateTargets);
-  layout->addLayout(qualityHBox);
+        targetLayout->addWidget(refreshTargetsButton);
-
+      }
-  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_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 button = new QPushButton(this);
     button->setText("Start Stream");
@@ -56,23 +90,32 @@ StreamDialog::StreamDialog() : QWidget() {
     layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
 
     setLayout(layout);
+  }
 
   setWindowTitle("discord-screenaudio Stream Dialog");
 }
 
 void StreamDialog::startStream() {
-  auto resolution =
+  auto resolution = m_resolutionComboBox->currentData().toString().split('x');
-      m_qualityResolutionComboBox->currentData().toString().split('x');
+  emit requestedStreamStart(m_videoGroupBox->isChecked(),
-  emit requestedStreamStart(m_targetComboBox->currentText(),
+                            m_audioGroupBox->isChecked(),
                             resolution[0].toUInt(), resolution[1].toUInt(),
-                            m_qualityFPSComboBox->currentData().toUInt());
+                            m_framerateComboBox->currentData().toUInt(),
+                            m_targetComboBox->currentText());
   setHidden(true);
 }
 
 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);
   }
+
+  if (m_targetComboBox->findText(lastTarget) != -1)
+    m_targetComboBox->setCurrentText(lastTarget);
+  else
+    m_targetComboBox->setCurrentText("[All Desktop Audio]");
 }

src/streamdialog.h

@@ -2,6 +2,7 @@
 
 #include <QComboBox>
 #include <QDialog>
+#include <QGroupBox>
 #include <QWidget>
 
 class StreamDialog : public QWidget {
@@ -12,12 +13,14 @@ public:
 
 private:
   QComboBox *m_targetComboBox;
-  QComboBox *m_qualityResolutionComboBox;
+  QComboBox *m_resolutionComboBox;
-  QComboBox *m_qualityFPSComboBox;
+  QComboBox *m_framerateComboBox;
+  QGroupBox *m_videoGroupBox;
+  QGroupBox *m_audioGroupBox;
 
 Q_SIGNALS:
-  void requestedStreamStart(QString target, uint width, uint height,
+  void requestedStreamStart(bool video, bool audio, uint width, uint height,
-                            uint frameRate);
+                            uint frameRate, QString target);
 
 public Q_SLOTS:
   void updateTargets();

src/virtmic.cpp

@@ -1,10 +1,13 @@
 #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);
@@ -19,10 +22,10 @@ QVector<QString> getTargets() {
         if (global.type == pipewire::node::type) {
           auto node = reg.bind<pipewire::node>(global.id);
           auto info = node.info();
+          auto name = QString::fromStdString(info.props["application.name"]);
 
-          if (info.props.count("node.name")) {
+          if (name != "" && !EXCLUDE_TARGETS.contains(name) &&
-            auto name = QString::fromStdString(info.props["node.name"]);
+              !targets.contains(name)) {
-            if (!targets.contains(name))
             targets.append(name);
           }
         }
@@ -64,20 +67,24 @@ void start(QString _target) {
         continue;
 
       auto &parent = nodes.at(parent_id);
+      auto name = parent.props["application.name"];
 
-      if (parent.props["node.name"].find(target) != std::string::npos) {
+      if (name == target ||
-        std::cout << "[virtmic] "
+          (target == "[All Desktop Audio]" &&
-                  << "Link   : " << target << ":" << port_id << " -> ";
+           !EXCLUDE_TARGETS.contains(QString::fromStdString(name)))) {
-
+        auto fl = port.info().props["audio.channel"] == "FL";
-        if (port.info().props["audio.channel"] == "FL") {
+        links.emplace(
-          links.emplace(port_id, core.create<pipewire::link_factory>(
+            port_id,
-                                     {virt_fl->info().id, port_id}));
+            core.create<pipewire::link_factory>(
-          std::cout << "[virtmic] " << virt_fl->info().id << std::endl;
+                {fl ? virt_fl->info().id : virt_fr->info().id, port_id}));
-        } else {
+        qDebug(virtmicLog) << QString("Link: %1:%2 -> %3")
-          links.emplace(port_id, core.create<pipewire::link_factory>(
+                                  .arg(QString::fromStdString(
-                                     {virt_fr->info().id, port_id}));
+                                      parent.props["application.name"]))
-          std::cout << "[virtmic] " << virt_fr->info().id << std::endl;
+                                  .arg(port_id)
-        }
+                                  .arg(fl ? virt_fl->info().id
+                                          : virt_fr->info().id)
+                                  .toUtf8()
+                                  .data();
       }
     }
   };
@@ -93,7 +100,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();
     }
@@ -105,9 +112,13 @@ void start(QString _target) {
       [&](const pipewire::global &global) {
         if (global.type == pipewire::node::type) {
           auto node = reg.bind<pipewire::node>(global.id);
-          std::cout << "[virtmic] "
+          if (!node.info().props.count("application.name"))
-                    << "Added  : " << node.info().props["node.name"]
+            return;
-                    << std::endl;
+          qDebug(virtmicLog) << QString("Added: %1")
+                                    .arg(QString::fromStdString(
+                                        node.info().props["application.name"]))
+                                    .toUtf8()
+                                    .data();
 
           if (!nodes.count(global.id)) {
             nodes.emplace(global.id, node.info());
@@ -141,8 +152,11 @@ void start(QString _target) {
       [&](const std::uint32_t id) {
         if (nodes.count(id)) {
           auto info = nodes.at(id);
-          std::cout << "[virtmic] "
+          qDebug(virtmicLog) << QString("Removed: %1")
-                    << "Removed: " << info.props["node.name"] << std::endl;
+                                    .arg(QString::fromStdString(
+                                        info.props["application.name"].data()))
+                                    .toUtf8()
+                                    .data();
           nodes.erase(id);
         }
         if (ports.count(id)) {

version.cmake

@@ -138,11 +138,12 @@ function(determine_version source_dir var_prefix)
   # | 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+git20180604.2ee02af   |
+  # | 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 (NOT ${local_prefix}_VERSION_NCOMMITS EQUAL 0)
+  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 "")))