display correct steam resolution

Co-authored-by: edisionnano <samantas5855@gmail.com>

.gitignore

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

CMakeLists.txt

@@ -18,12 +18,18 @@ find_package(Qt5 CONFIG REQUIRED COMPONENTS
   WebEngineWidgets
 )
 
+find_package(KF5Notifications)
+if(KF5Notifications_FOUND)
+  add_definitions( -DKNOTIFICATIONS )
+endif()
+
 set(discord-screenaudio_SRC
   src/main.cpp
   src/mainwindow.cpp
   src/virtmic.cpp
   src/discordpage.cpp
   src/streamdialog.cpp
+  src/log.cpp
   resources.qrc
 )
 
@@ -52,6 +58,11 @@ add_executable(discord-screenaudio ${discord-screenaudio_SRC})
 
 target_link_libraries(discord-screenaudio 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()
+
 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)

README.md

@@ -1,12 +1,16 @@
 # 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).
 
+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_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
@@ -15,18 +19,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**
-- Only works on **X11**
+- Can only share primary screen on X11 (no other screens or specific
-- Can only share primary screen (no other screens or specific applications) (see
+  applications) (see
   [#1](https://github.com/maltejur/discord-screenaudio/issues/1))
 
 ## Installation
 
-If you are using Arch, you can build and install
+You have multiple options:
-[from the AUR](https://aur.archlinux.org/packages/discord-screenaudio). If you
+
-aren't, you will have to [build it yourself](#building-from-source).
+- 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)
 
 ## Building from Source
 
@@ -34,12 +51,12 @@ aren't, you will have to [build it yourself](#building-from-source).
 
 - Basic building tools
 - CMake
-- Qt5 and QtWebEngine
+- Qt5, QtWebEngine and Kf5Notifications
 - **PipeWire** (it currently doesn't work with PulseAudio)
 - Git
 
 On Debian:
-`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev pkg-config libpipewire-0.3-dev git`
+`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev pkg-config libpipewire-0.3-dev git`
 
 ### Building
 

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

@@ -8,15 +8,22 @@
     <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">
-    discord-screenaudio.desktop
+    de.shorsh.discord-screenaudio.desktop
   </launchable>
 
   <screenshots>
@@ -32,4 +39,12 @@
   <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>

assets/discord-screenaudio.notifyrc

@@ -0,0 +1,8 @@
+[Global]
+IconName=de.shorsh.discord-screenaudio
+Name=discord-screenaudio
+DesktopEntry=de.shorsh.discord-screenaudio.desktop
+
+[Event/discordNotification]
+Name=Discord Notification
+Action=Popup

assets/userscript.js

@@ -3,12 +3,25 @@
 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;
 };
 
@@ -99,6 +112,7 @@ setInterval(() => {
       const initialDisplay = el.style.display;
 
       window.discordScreenaudioStartStream = (width, height, frameRate) => {
+        window.discordScreenaudioResolutionString = `${height}p ${frameRate}FPS`;
         setGetDisplayMedia({
           audio: true,
           video: { width, height, frameRate },
@@ -134,6 +148,14 @@ setInterval(() => {
   // Remove stream settings if stream is active
   document.getElementById("manage-streams-change-windows")?.remove();
   document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
+
+  if (window.discordScreenaudioResolutionString) {
+    for (const el of document.getElementsByClassName(
+      "qualityIndicator-39wQDy"
+    )) {
+      el.innerHTML = window.discordScreenaudioResolutionString;
+    }
+  }
 }, 500);
 
 // Fix for broken discord notifications after restart

resources.qrc

@@ -2,5 +2,6 @@
 <RCC>
   <qresource>
     <file>assets/userscript.js</file>
+    <file>assets/de.shorsh.discord-screenaudio.png</file>
   </qresource>
 </RCC>

src/discordpage.cpp

@@ -1,4 +1,5 @@
 #include "discordpage.h"
+#include "log.h"
 #include "virtmic.h"
 
 #include <QApplication>
@@ -43,7 +44,7 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
 }
 
 void DiscordPage::injectScript(QString source) {
-  qDebug() << "[main   ] Injecting " << source;
+  qDebug(mainLog) << "Injecting " << source;
 
   QFile userscript(source);
 
@@ -87,7 +88,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,7 +120,7 @@ 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();
   }
@@ -127,7 +128,7 @@ void DiscordPage::stopVirtmic() {
 
 void DiscordPage::startVirtmic(QString target) {
   if (target != "None") {
-    qDebug() << "[virtmic] Starting Virtmic with target" << target;
+    qDebug(virtmicLog) << "Starting Virtmic with target" << target;
     m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
   }
 }
@@ -143,8 +144,10 @@ void DiscordPage::javaScriptConsoleMessage(
     m_streamDialog.updateTargets();
   } else if (message == "!discord-screenaudio-stream-stopped") {
     stopVirtmic();
+  } else if (message.startsWith("dsa: ")) {
+    qDebug(userscriptLog) << message.mid(5).toUtf8().constData();
   } else {
-    qDebug() << "[discord]" << message;
+    qDebug(discordLog) << message;
   }
 }
 

src/log.cpp

@@ -0,0 +1,6 @@
+#include "log.h"
+
+Q_LOGGING_CATEGORY(mainLog, "main");
+Q_LOGGING_CATEGORY(discordLog, "discord");
+Q_LOGGING_CATEGORY(userscriptLog, "userscript");
+Q_LOGGING_CATEGORY(virtmicLog, "virtmic");

src/log.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(mainLog);
+Q_DECLARE_LOGGING_CATEGORY(discordLog);
+Q_DECLARE_LOGGING_CATEGORY(userscriptLog);
+Q_DECLARE_LOGGING_CATEGORY(virtmicLog);

src/main.cpp

@@ -3,11 +3,17 @@
 
 #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}");
 
   QCommandLineParser parser;
   parser.setApplicationDescription(
@@ -17,16 +23,24 @@ 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
   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;
   w.show();
 

src/mainwindow.cpp

@@ -1,6 +1,10 @@
 #include "mainwindow.h"
 #include "virtmic.h"
 
+#ifdef KNOTIFICATIONS
+#include <KNotification>
+#endif
+
 #include <QApplication>
 #include <QColor>
 #include <QComboBox>
@@ -11,6 +15,8 @@
 #include <QSpacerItem>
 #include <QThread>
 #include <QUrl>
+#include <QWebEngineNotification>
+#include <QWebEngineProfile>
 #include <QWebEngineScript>
 #include <QWebEngineScriptCollection>
 #include <QWebEngineSettings>
@@ -30,6 +36,23 @@ void MainWindow::setupWebView() {
   m_webView = new QWebEngineView(this);
   m_webView->setPage(page);
 
+#ifdef KNOTIFICATIONS
+  QWebEngineProfile::defaultProfile()->setNotificationPresenter(
+      [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
+        KNotification *notification = new KNotification("discordNotification");
+        notification->setTitle(notificationInfo->title());
+        notification->setText(notificationInfo->message());
+        notification->setPixmap(QPixmap::fromImage(notificationInfo->icon()));
+        notification->setDefaultAction("View");
+        connect(notification, &KNotification::defaultActivated,
+                [&, notificationInfo = std::move(notificationInfo)]() {
+                  notificationInfo->click();
+                  activateWindow();
+                });
+        notification->sendEvent();
+      });
+#endif
+
   setCentralWidget(m_webView);
 }
 

src/streamdialog.cpp

@@ -13,14 +13,25 @@ StreamDialog::StreamDialog() : QWidget() {
   setAttribute(Qt::WA_QuitOnClose, false);
 
   auto layout = new QVBoxLayout(this);
+  layout->setSizeConstraint(QLayout::SetFixedSize);
 
   auto targetLabel = new QLabel(this);
   targetLabel->setText("Which app do you want to stream sound from?");
   layout->addWidget(targetLabel);
 
+  auto targetHBox = new QHBoxLayout(this);
+  layout->addLayout(targetHBox);
+
   m_targetComboBox = new QComboBox(this);
   updateTargets();
-  layout->addWidget(m_targetComboBox);
+  targetHBox->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);
+  targetHBox->addWidget(refreshTargetsButton);
 
   auto qualityLabel = new QLabel(this);
   qualityLabel->setText("Stream Quality");
@@ -57,7 +68,6 @@ StreamDialog::StreamDialog() : QWidget() {
   setLayout(layout);
 
   setWindowTitle("discord-screenaudio Stream Dialog");
-  setFixedSize(0, 0);
 }
 
 void StreamDialog::startStream() {
@@ -70,9 +80,17 @@ void StreamDialog::startStream() {
 }
 
 void StreamDialog::updateTargets() {
+  auto lastTarget = m_targetComboBox->currentText();
+
   m_targetComboBox->clear();
-  m_targetComboBox->addItem("None");
+  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/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 "")))