Compare commits
106 Commits
v1.0.0-rc.
...
dependency
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e939c4592 | ||
|
|
27faed4a3a | ||
|
|
10fff86ca4 | ||
|
|
87e84dec5c | ||
|
|
4b782133ae | ||
|
|
d5257207bc | ||
|
|
423884ae0c | ||
|
|
7ea3d0aab1 | ||
|
|
18b15f5cf4 | ||
|
|
96bca52d0d | ||
|
|
3540774c82 | ||
|
|
b5435acdd8 | ||
|
|
38c2b92e2d | ||
|
|
e447206082 | ||
|
|
77f31b63aa | ||
|
|
0b9fc100c2 | ||
|
|
f73524de27 | ||
|
|
8a8690fe53 | ||
|
|
259e6dc75d | ||
|
|
9cbdca0441 | ||
|
|
a9ddc0216f | ||
|
|
b39e23d462 | ||
|
|
331fb8f4ca | ||
|
|
335a4456ed | ||
|
|
26a2ca7b05 | ||
|
|
30c0526ff7 | ||
|
|
3119e1df19 | ||
|
|
63180f5d53 | ||
|
|
78d43991ab | ||
|
|
193b69f45f | ||
|
|
485ff9634b | ||
|
|
74fdef683f | ||
|
|
02fdc62fbe | ||
|
|
d9e3704176 | ||
|
|
36c8cfedb7 | ||
|
|
c52daab420 | ||
|
|
8c4fae3410 | ||
|
|
ac71e9bbcb | ||
|
|
fc0dbb5b34 | ||
|
|
5df24629e6 | ||
|
|
1477a9d4c0 | ||
|
|
0b12487dfd | ||
|
|
a10cfda56d | ||
|
|
2a809e163e | ||
|
|
bc317d5531 | ||
|
|
b4db987217 | ||
|
|
9f46e710a9 | ||
|
|
d6641a7a6e | ||
|
|
b836be6530 | ||
|
|
bfb0714b13 | ||
|
|
374b854261 | ||
|
|
1f6105f76b | ||
|
|
3071159332 | ||
|
|
f2de080e1b | ||
|
|
f4a60f281d | ||
|
|
d693535d53 | ||
|
|
e41af697f7 | ||
|
|
b0a8815bb8 | ||
|
|
150fd4364e | ||
|
|
a0a2924796 | ||
|
|
3c48621427 | ||
|
|
9faabe1f3e | ||
|
|
68473d04d8 | ||
|
|
7c8f72b8d8 | ||
|
|
27cdd9f9a5 | ||
|
|
d184823ee9 | ||
|
|
dd2beed4eb | ||
|
|
3740553aba | ||
|
|
555f5c62f5 | ||
|
|
af3c62c263 | ||
|
|
c4f6c33f9d | ||
|
|
758ffa8cb5 | ||
|
|
753da8b1d3 | ||
|
|
5f37ab314f | ||
|
|
c7bff3f428 | ||
|
|
34e23f7187 | ||
|
|
c325dd6798 | ||
|
|
b42fde85d1 | ||
|
|
cc379ada85 | ||
|
|
fdb6145bbd | ||
|
|
8bd4d1896a | ||
|
|
1a2d09fe3d | ||
|
|
f01c941c90 | ||
|
|
95d391e869 | ||
|
|
af107168db | ||
|
|
e7e6c5d82b | ||
|
|
ee0c66762d | ||
|
|
c3483a42db | ||
|
|
d68797cebb | ||
|
|
ef221d4574 | ||
|
|
3fa2e3fa3c | ||
|
|
bda1bc0df6 | ||
|
|
cb0f084d42 | ||
|
|
674ac146f2 | ||
|
|
1ab00ee774 | ||
|
|
38bcc30ed4 | ||
|
|
204439af94 | ||
|
|
8fc529102c | ||
|
|
a7a8346b63 | ||
|
|
88b129f863 | ||
|
|
f4fc2e1f19 | ||
|
|
e1b35e3ca8 | ||
|
|
a773795e38 | ||
|
|
c8695ca5ff | ||
|
|
bc23d3423a | ||
|
|
f5217dfdfa |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1 +1,3 @@
|
|||||||
/build
|
/build
|
||||||
|
.vscode
|
||||||
|
/submodules/arrpc
|
||||||
|
|||||||
@@ -1,17 +1,40 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.0)
|
||||||
project(discord-screenaudio)
|
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_CXX_STANDARD 17)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
|
||||||
|
string(TIMESTAMP TIMESTAMP %s)
|
||||||
# set(CMAKE_AUTOUIC ON)
|
# 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)
|
||||||
)
|
|
||||||
|
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(discord-screenaudio_SRC
|
||||||
src/main.cpp
|
src/main.cpp
|
||||||
@@ -19,6 +42,10 @@ set(discord-screenaudio_SRC
|
|||||||
src/virtmic.cpp
|
src/virtmic.cpp
|
||||||
src/discordpage.cpp
|
src/discordpage.cpp
|
||||||
src/streamdialog.cpp
|
src/streamdialog.cpp
|
||||||
|
src/log.cpp
|
||||||
|
src/userscript.cpp
|
||||||
|
src/centralwidget.cpp
|
||||||
|
src/dependencycheck.cpp
|
||||||
resources.qrc
|
resources.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -45,7 +72,21 @@ add_subdirectory(submodules/rohrkabel)
|
|||||||
|
|
||||||
add_executable(discord-screenaudio ${discord-screenaudio_SRC})
|
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_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(TARGETS discord-screenaudio DESTINATION bin)
|
||||||
install(PROGRAMS assets/discord-screenaudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
|
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)
|
||||||
|
|||||||
62
README.md
62
README.md
@@ -1,13 +1,17 @@
|
|||||||
# discord-screenaudio
|
# 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)
|
[great work](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
|
||||||
of [@edisionnano](https://github.com/edisionnano) and the
|
of [@edisionnano](https://github.com/edisionnano) and the
|
||||||
[Rohrkabel library](https://github.com/Soundux/rohrkabel) by
|
[Rohrkabel library](https://github.com/Soundux/rohrkabel) by
|
||||||
[@Curve](https://github.com/Curve).
|
[@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-does-this-work)).
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
The purpose of this project is **not** to provide an alternative to the original
|
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
|
Discord client. Rather, it should be used in addition to the original client in
|
||||||
@@ -15,31 +19,48 @@ 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
|
anything else, this client has way too many things that work less well than in
|
||||||
the original client.
|
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
|
## Known Issues
|
||||||
|
|
||||||
- Only works with **PipeWire**
|
- 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))
|
[#1](https://github.com/maltejur/discord-screenaudio/issues/1))
|
||||||
|
|
||||||
## Installation
|
## 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
|
## Building from Source
|
||||||
|
|
||||||
### Requirements
|
### Requirements
|
||||||
|
|
||||||
- Basic building tools
|
- Basic building tools
|
||||||
|
- An up-to-date system (I can't guarantee that it works on Debian or Ubuntu
|
||||||
|
20/21)
|
||||||
- CMake
|
- CMake
|
||||||
- Qt5 and QtWebEngine
|
- Qt5 and QtWebEngine
|
||||||
- **PipeWire** (it currently doesn't work with PulseAudio)
|
- **PipeWire** (it currently doesn't work with PulseAudio)
|
||||||
- Git
|
- 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 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
|
### Building
|
||||||
|
|
||||||
@@ -63,7 +84,9 @@ And then to optionally install it, run:
|
|||||||
sudo cmake --install build
|
sudo cmake --install build
|
||||||
```
|
```
|
||||||
|
|
||||||
## How it works
|
## FAQ
|
||||||
|
|
||||||
|
### How does this work?
|
||||||
|
|
||||||
This whole project is based on
|
This whole project is based on
|
||||||
[this](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
|
[this](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
|
||||||
@@ -72,6 +95,23 @@ Discord. Basically: a virtual microphone is created which captures the
|
|||||||
application audio, and this microphone is then fed to the Discord stream by
|
application audio, and this microphone is then fed to the Discord stream by
|
||||||
intercepting a API call of Discord.
|
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` (or
|
||||||
|
`~/.var/app/de.shorsh.discord-screenaudio/config/discord-screenaudio/userstyles.css`
|
||||||
|
if you are using the Flatpak). But please note that due to QtWebEngine
|
||||||
|
limitations concerning content security policies, you can't use any external
|
||||||
|
files (like `@import` or `url()`).
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Copyright (C) 2022 Malte Jürgens
|
Copyright (C) 2022 Malte Jürgens
|
||||||
|
|||||||
1
assets/arrpc.js
Normal file
1
assets/arrpc.js
Normal file
File diff suppressed because one or more lines are too long
1
assets/arrpc_bridge_mod.js
Normal file
1
assets/arrpc_bridge_mod.js
Normal file
@@ -0,0 +1 @@
|
|||||||
|
setTimeout((i=>{let t,a,s,e={};new WebSocket("ws://127.0.0.1:1337").onmessage=async i=>{if(msg=JSON.parse(i.data),console.log(msg),!t){const i=window.webpackChunkdiscord_app.push([[Symbol()],{},i=>i]),e=i.c;window.webpackChunkdiscord_app.pop();for(const i in e){let a=e[i].exports;if(a=a&&(a.Z??a.ZP),a&&a.register&&a.wait){t=a;break}}const n=i.m;for(const t in n)if(n[t].toString().includes("getAssetImage: size must === [number, number] for Twitch")){const s=i(t),e=Object.values(s).find((i=>"function"==typeof i&&i.toString().includes("apply(")));a=async(i,t)=>(await e(i,[t,void 0]))[0];break}for(const t in n)if(n[t].toString().includes("e.application={")){const a=i(t),e=Object.values(a).find((i=>"function"==typeof i&&i.toString().includes("e.application={")));s=async i=>{let t={};return await e(t,i),t.application};break}}if(msg.activity?.assets?.large_image&&(msg.activity.assets.large_image=await a(msg.activity.application_id,msg.activity.assets.large_image)),msg.activity?.assets?.small_image&&(msg.activity.assets.small_image=await a(msg.activity.application_id,msg.activity.assets.small_image)),msg.activity){const i=msg.activity.application_id;e[i]||(e[i]=await s(i));const t=e[i];msg.activity.name||(msg.activity.name=t.name)}t.dispatch({type:"LOCAL_ACTIVITY_UPDATE",...msg})}}),1e4);
|
||||||
8
assets/de.shorsh.discord-screenaudio.desktop
Normal file
8
assets/de.shorsh.discord-screenaudio.desktop
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
[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
|
||||||
51
assets/de.shorsh.discord-screenaudio.metainfo.xml.in
Normal file
51
assets/de.shorsh.discord-screenaudio.metainfo.xml.in
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
<?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>
|
||||||
BIN
assets/de.shorsh.discord-screenaudio.png
Normal file
BIN
assets/de.shorsh.discord-screenaudio.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
@@ -1,6 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=discord-screenaudio
|
|
||||||
Exec=discord-screenaudio
|
|
||||||
Icon=discord
|
|
||||||
Terminal=false
|
|
||||||
8
assets/discord-screenaudio.notifyrc
Normal file
8
assets/discord-screenaudio.notifyrc
Normal file
@@ -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
|
||||||
@@ -1,18 +1,29 @@
|
|||||||
// From v0.4
|
|
||||||
|
|
||||||
navigator.mediaDevices.chromiumGetDisplayMedia =
|
navigator.mediaDevices.chromiumGetDisplayMedia =
|
||||||
navigator.mediaDevices.getDisplayMedia;
|
navigator.mediaDevices.getDisplayMedia;
|
||||||
|
|
||||||
|
function sleep(ms) {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
|
}
|
||||||
|
|
||||||
const getAudioDevice = async (nameOfAudioDevice) => {
|
const getAudioDevice = async (nameOfAudioDevice) => {
|
||||||
await navigator.mediaDevices.getUserMedia({
|
await navigator.mediaDevices.getUserMedia({
|
||||||
audio: true,
|
audio: true,
|
||||||
});
|
});
|
||||||
let devices = await navigator.mediaDevices.enumerateDevices();
|
let audioDevice;
|
||||||
let audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
|
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}'`);
|
||||||
return audioDevice;
|
return audioDevice;
|
||||||
};
|
};
|
||||||
|
|
||||||
function setGetDisplayMedia(overrideArgs = undefined) {
|
function setGetDisplayMedia(video = true, overrideArgs = undefined) {
|
||||||
const getDisplayMedia = async (...args) => {
|
const getDisplayMedia = async (...args) => {
|
||||||
var id;
|
var id;
|
||||||
try {
|
try {
|
||||||
@@ -50,6 +61,7 @@ function setGetDisplayMedia(overrideArgs = undefined) {
|
|||||||
: args || [{ video: true, audio: true }])
|
: args || [{ video: true, audio: true }])
|
||||||
);
|
);
|
||||||
gdm.addTrack(track);
|
gdm.addTrack(track);
|
||||||
|
if (!video) for (const track of gdm.getVideoTracks()) track.enabled = false;
|
||||||
return gdm;
|
return gdm;
|
||||||
};
|
};
|
||||||
navigator.mediaDevices.getDisplayMedia = getDisplayMedia;
|
navigator.mediaDevices.getDisplayMedia = getDisplayMedia;
|
||||||
@@ -57,79 +69,304 @@ function setGetDisplayMedia(overrideArgs = undefined) {
|
|||||||
|
|
||||||
setGetDisplayMedia();
|
setGetDisplayMedia();
|
||||||
|
|
||||||
|
let userscript;
|
||||||
|
let muteBtn;
|
||||||
|
let deafenBtn;
|
||||||
|
let streamStartBtn;
|
||||||
|
let streamStartBtnInitialDisplay;
|
||||||
|
let streamStartBtnClone;
|
||||||
|
let resolutionString;
|
||||||
const clonedElements = [];
|
const clonedElements = [];
|
||||||
const hiddenElements = [];
|
const hiddenElements = [];
|
||||||
let wasStreamActive = false;
|
let wasStreamActive = false;
|
||||||
|
|
||||||
setInterval(() => {
|
function createButton(text, onClick) {
|
||||||
const streamActive =
|
const button = document.createElement("button");
|
||||||
document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
|
button.style.marginBottom = "20px";
|
||||||
.length > 0;
|
button.classList =
|
||||||
|
"button-ejjZWC lookFilled-1H2Jvj colorBrand-2M3O3N sizeSmall-3R2P2p grow-2T4nbg";
|
||||||
|
button.innerText = text;
|
||||||
|
button.addEventListener("click", onClick);
|
||||||
|
return button;
|
||||||
|
}
|
||||||
|
|
||||||
if (!streamActive && wasStreamActive)
|
function createSwitch(text, enabled, onClick) {
|
||||||
console.log("!discord-screenaudio-stream-stopped");
|
const container = document.createElement("div");
|
||||||
wasStreamActive = streamActive;
|
container.style.marginBottom = "20px";
|
||||||
|
container.className = "labelRow-NnoUIp";
|
||||||
|
|
||||||
if (streamActive) {
|
const label = document.createElement("label");
|
||||||
clonedElements.forEach((el) => {
|
label.innerText = text;
|
||||||
el.remove();
|
label.className = "title-2yADjX";
|
||||||
});
|
container.appendChild(label);
|
||||||
clonedElements.length = 0;
|
|
||||||
|
|
||||||
hiddenElements.forEach((el) => {
|
const svg = document.createElement("div");
|
||||||
el.style.display = "block";
|
container.appendChild(svg);
|
||||||
});
|
|
||||||
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");
|
|
||||||
});
|
|
||||||
|
|
||||||
const initialDisplay = el.style.display;
|
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>`;
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add about text in settings
|
function setSvgEnabled() {
|
||||||
if (
|
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>`;
|
||||||
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";
|
|
||||||
aboutEl.style.fontSize = "12px";
|
|
||||||
aboutEl.style.color = "var(--text-muted)";
|
|
||||||
aboutEl.classList.add("dirscordScreenaudioAboutText");
|
|
||||||
el.appendChild(aboutEl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove stream settings if stream is active
|
function updateSvg() {
|
||||||
document.getElementById("manage-streams-change-windows")?.remove();
|
if (enabled) setSvgEnabled();
|
||||||
document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
|
else setSvgDisabled();
|
||||||
}, 500);
|
}
|
||||||
|
|
||||||
|
container.addEventListener("click", () => {
|
||||||
|
enabled = !enabled;
|
||||||
|
updateSvg();
|
||||||
|
onClick(enabled);
|
||||||
|
});
|
||||||
|
updateSvg();
|
||||||
|
|
||||||
|
return container;
|
||||||
|
}
|
||||||
|
|
||||||
// Fix for broken discord notifications after restart
|
// Fix for broken discord notifications after restart
|
||||||
// (https://github.com/maltejur/discord-screenaudio/issues/17)
|
// (https://github.com/maltejur/discord-screenaudio/issues/17)
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
new QWebChannel(qt.webChannelTransport, (channel) => {
|
||||||
|
userscript = channel.objects.userscript;
|
||||||
|
main();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
userscript.muteToggled.connect(() => {
|
||||||
|
console.log("Toggling mute");
|
||||||
|
muteBtn && muteBtn.click();
|
||||||
|
});
|
||||||
|
|
||||||
|
userscript.deafenToggled.connect(() => {
|
||||||
|
console.log("Toggling deafen");
|
||||||
|
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();
|
||||||
|
});
|
||||||
|
|
||||||
|
function updateUserstyles() {
|
||||||
|
userscript.log("Loading userstyles...");
|
||||||
|
userscript.loadingMessage = "Loading userstyles...";
|
||||||
|
let stylesheet = document.getElementById("discordScreenaudioUserstyles");
|
||||||
|
if (stylesheet) {
|
||||||
|
userscript.log("Removing old userstyles...");
|
||||||
|
stylesheet.remove();
|
||||||
|
}
|
||||||
|
stylesheet = document.createElement("style");
|
||||||
|
stylesheet.id = "discordScreenaudioUserstyles";
|
||||||
|
stylesheet.innerText = userscript.userstyles;
|
||||||
|
document.head.appendChild(stylesheet);
|
||||||
|
userscript.log("Finished loading userstyles");
|
||||||
|
userscript.loadingMessage = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
userscript.userstylesChanged.connect(updateUserstyles);
|
||||||
|
setTimeout(() => updateUserstyles());
|
||||||
|
|
||||||
|
setInterval(async () => {
|
||||||
|
const streamActive =
|
||||||
|
document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
|
||||||
|
.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.getElementsByTagName("button")[0]
|
||||||
|
: null;
|
||||||
|
|
||||||
|
deafenBtn = buttonContainer
|
||||||
|
? buttonContainer.getElementsByTagName("button")[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(
|
||||||
|
// createButton("Install Theme", () => {
|
||||||
|
// userscript.showThemeDialog();
|
||||||
|
// })
|
||||||
|
// );
|
||||||
|
|
||||||
|
// section.appendChild(
|
||||||
|
// createButton("Uninstall Theme", () => {
|
||||||
|
// userscript.installUserStyles("");
|
||||||
|
// })
|
||||||
|
// );
|
||||||
|
|
||||||
|
section.appendChild(
|
||||||
|
createSwitch(
|
||||||
|
"Move discord-screenaudio to the system tray instead of closing",
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,5 +2,8 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource>
|
<qresource>
|
||||||
<file>assets/userscript.js</file>
|
<file>assets/userscript.js</file>
|
||||||
|
<file>assets/arrpc_bridge_mod.js</file>
|
||||||
|
<file>assets/arrpc.js</file>
|
||||||
|
<file>assets/de.shorsh.discord-screenaudio.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
36
scripts/build_arrpc.sh
Executable file
36
scripts/build_arrpc.sh
Executable file
@@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
cd "$(dirname "$0")/../submodules"
|
||||||
|
|
||||||
|
echo_status() {
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo "-> $1..."
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ ! -d "arrpc" ]; then
|
||||||
|
echo_status "Cloning arRPC"
|
||||||
|
git clone https://github.com/OpenAsar/arrpc.git
|
||||||
|
cd arrpc
|
||||||
|
else
|
||||||
|
echo_status "Fetching arRPC changes"
|
||||||
|
cd arrpc
|
||||||
|
git fetch
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo_status "Checking out latest commit"
|
||||||
|
git reset --hard HEAD
|
||||||
|
git checkout main
|
||||||
|
|
||||||
|
echo_status "Installing dependencies"
|
||||||
|
pnpm i -D @vercel/ncc
|
||||||
|
|
||||||
|
echo_status "Patching arRPC"
|
||||||
|
sed -i 's/"type": "module",//' package.json
|
||||||
|
|
||||||
|
echo_status "Building arRPC"
|
||||||
|
pnpm exec ncc build -m src/index.js
|
||||||
|
|
||||||
|
echo_status "Copying built file"
|
||||||
|
cp -v ./dist/index.js ../../assets/arrpc.js
|
||||||
84
src/centralwidget.cpp
Normal file
84
src/centralwidget.cpp
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
#include "centralwidget.h"
|
||||||
|
#include "discordpage.h"
|
||||||
|
#include "mainwindow.h"
|
||||||
|
|
||||||
|
#include <QWebEngineNotification>
|
||||||
|
#include <QWebEngineProfile>
|
||||||
|
#include <QWebEngineScript>
|
||||||
|
#include <QWebEngineScriptCollection>
|
||||||
|
#include <QWebEngineSettings>
|
||||||
|
|
||||||
|
CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) {
|
||||||
|
setStyleSheet("background-color:#313338;");
|
||||||
|
m_layout = new QVBoxLayout(this);
|
||||||
|
m_layout->setMargin(0);
|
||||||
|
m_layout->setSpacing(0);
|
||||||
|
setupWebView();
|
||||||
|
}
|
||||||
|
|
||||||
|
void CentralWidget::setupWebView() {
|
||||||
|
auto page = new DiscordPage(this);
|
||||||
|
|
||||||
|
m_webView = new QWebEngineView(this);
|
||||||
|
m_webView->setPage(page);
|
||||||
|
|
||||||
|
bool useNotifySend = MainWindow::instance()
|
||||||
|
->settings()
|
||||||
|
->value("useNotifySend", false)
|
||||||
|
.toBool();
|
||||||
|
if (m_useKF5Notifications || useNotifySend)
|
||||||
|
QWebEngineProfile::defaultProfile()->setNotificationPresenter(
|
||||||
|
[&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
|
||||||
|
if (useNotifySend) {
|
||||||
|
auto title = notificationInfo->title();
|
||||||
|
auto message = notificationInfo->message();
|
||||||
|
auto image_path =
|
||||||
|
QString("/tmp/discord-screenaudio-%1.png").arg(title);
|
||||||
|
notificationInfo->icon().save(image_path);
|
||||||
|
QProcess::execute("notify-send",
|
||||||
|
{"--icon", image_path, "--app-name",
|
||||||
|
"discord-screenaudio", title, message});
|
||||||
|
} else if (m_useKF5Notifications) {
|
||||||
|
#ifdef KNOTIFICATIONS
|
||||||
|
KNotification *notification =
|
||||||
|
new KNotification("discordNotification");
|
||||||
|
notification->setTitle(notificationInfo->title());
|
||||||
|
notification->setText(notificationInfo->message());
|
||||||
|
notification->setPixmap(
|
||||||
|
QPixmap::fromImage(notificationInfo->icon()));
|
||||||
|
notification->setDefaultAction("View");
|
||||||
|
connect(notification, &KNotification::defaultActivated,
|
||||||
|
[&, notificationInfo = std::move(notificationInfo)]() {
|
||||||
|
notificationInfo->click();
|
||||||
|
show();
|
||||||
|
activateWindow();
|
||||||
|
});
|
||||||
|
notification->sendEvent();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
connect(page->userScript(), &UserScript::loadingMessageChanged, this,
|
||||||
|
&CentralWidget::setLoadingIndicator);
|
||||||
|
|
||||||
|
m_layout->addWidget(m_webView);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CentralWidget::setLoadingIndicator(QString text) {
|
||||||
|
if (text != "") {
|
||||||
|
if (m_loadingLabel == nullptr) {
|
||||||
|
m_loadingLabel = new QLabel(this);
|
||||||
|
m_loadingLabel->setMaximumHeight(20);
|
||||||
|
m_loadingLabel->setAlignment(Qt::AlignHCenter);
|
||||||
|
m_loadingLabel->setStyleSheet("color:#dedede;");
|
||||||
|
m_layout->addWidget(m_loadingLabel);
|
||||||
|
}
|
||||||
|
m_loadingLabel->setText(text.mid(0, 100));
|
||||||
|
} else {
|
||||||
|
if (m_loadingLabel != nullptr) {
|
||||||
|
m_layout->removeWidget(m_loadingLabel);
|
||||||
|
m_loadingLabel->deleteLater();
|
||||||
|
m_loadingLabel = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
29
src/centralwidget.h
Normal file
29
src/centralwidget.h
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QWebEnginePage>
|
||||||
|
#include <QWebEngineProfile>
|
||||||
|
#include <QWebEngineView>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
class CentralWidget : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
CentralWidget(QWidget *parent = nullptr);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void setupWebView();
|
||||||
|
QVBoxLayout *m_layout;
|
||||||
|
QWebEngineView *m_webView;
|
||||||
|
#ifdef KNOTIFICATIONS
|
||||||
|
bool m_useKF5Notifications = true;
|
||||||
|
#else
|
||||||
|
bool m_useKF5Notifications = false;
|
||||||
|
#endif
|
||||||
|
QLabel *m_loadingLabel = nullptr;
|
||||||
|
|
||||||
|
public Q_SLOTS:
|
||||||
|
void setLoadingIndicator(QString text);
|
||||||
|
};
|
||||||
10
src/dependencycheck.cpp
Normal file
10
src/dependencycheck.cpp
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#include "dependencycheck.h"
|
||||||
|
#include "pipewire-0.3/pipewire/version.h"
|
||||||
|
|
||||||
|
#include <QMessageBox>
|
||||||
|
|
||||||
|
void checkDependencies() {
|
||||||
|
QString versionPipewire(pw_get_library_version());
|
||||||
|
QMessageBox::information(nullptr, "Dependency Check",
|
||||||
|
QString("Pipewire: v%1").arg(versionPipewire));
|
||||||
|
}
|
||||||
3
src/dependencycheck.h
Normal file
3
src/dependencycheck.h
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
void checkDependencies();
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
#include "discordpage.h"
|
#include "discordpage.h"
|
||||||
|
#include "log.h"
|
||||||
|
#include "mainwindow.h"
|
||||||
#include "virtmic.h"
|
#include "virtmic.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QTemporaryFile>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QWebChannel>
|
#include <QWebChannel>
|
||||||
#include <QWebEngineScript>
|
#include <QWebEngineScript>
|
||||||
@@ -11,12 +17,31 @@
|
|||||||
#include <QWebEngineSettings>
|
#include <QWebEngineSettings>
|
||||||
|
|
||||||
DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
|
DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
|
||||||
setBackgroundColor(QColor("#202225"));
|
setBackgroundColor(QColor("#313338"));
|
||||||
m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);
|
|
||||||
|
|
||||||
connect(this, &QWebEnginePage::featurePermissionRequested, this,
|
connect(this, &QWebEnginePage::featurePermissionRequested, this,
|
||||||
&DiscordPage::featurePermissionRequested);
|
&DiscordPage::featurePermissionRequested);
|
||||||
|
connect(this, &DiscordPage::fullScreenRequested, MainWindow::instance(),
|
||||||
|
&MainWindow::fullScreenRequested);
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
|
setupUserStyles();
|
||||||
|
setupArrpc();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DiscordPage::setupPermissions() {
|
||||||
settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, true);
|
settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, true);
|
||||||
settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
|
settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
|
||||||
settings()->setAttribute(QWebEngineSettings::AllowRunningInsecureContent,
|
settings()->setAttribute(QWebEngineSettings::AllowRunningInsecureContent,
|
||||||
@@ -27,35 +52,125 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
|
|||||||
settings()->setAttribute(QWebEngineSettings::PlaybackRequiresUserGesture,
|
settings()->setAttribute(QWebEngineSettings::PlaybackRequiresUserGesture,
|
||||||
false);
|
false);
|
||||||
settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, 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::injectScript(QString source) {
|
void DiscordPage::setupUserStyles() {
|
||||||
qDebug() << "[main ] Injecting " << source;
|
qDebug(userstylesLog).noquote()
|
||||||
|
<< "Looking for userstyles in" << m_configLocation.absolutePath();
|
||||||
|
m_userStylesFile =
|
||||||
|
new QFile(m_configLocation.absoluteFilePath("userstyles.css"));
|
||||||
|
if (m_userStylesFile->exists()) {
|
||||||
|
qDebug(userstylesLog).noquote()
|
||||||
|
<< "Found userstyles:" << m_userStylesFile->fileName();
|
||||||
|
m_userStylesFile->open(QIODevice::ReadOnly);
|
||||||
|
m_userStylesContent = m_userStylesFile->readAll();
|
||||||
|
m_userStylesFile->close();
|
||||||
|
fetchUserStyles();
|
||||||
|
}
|
||||||
|
connect(&m_userScript, &UserScript::shouldInstallUserStyles, this,
|
||||||
|
&DiscordPage::getUserStyles);
|
||||||
|
}
|
||||||
|
|
||||||
QFile userscript(source);
|
const QRegularExpression importRegex(
|
||||||
|
R"r(@import (?:url\(|)['"]{0,1}(?!.*usrbgs?\.css)([^'"]+?)['"]{0,1}(?:|\));)r");
|
||||||
|
const QRegularExpression urlRegex(
|
||||||
|
R"r(url\(['"]{0,1}((?!https:\/\/fonts.gstatic.com)(?!data:)(?!.*\.woff2)(?!.*\.ttf)[^'"]+?)['"]{0,1}\))r");
|
||||||
|
|
||||||
if (!userscript.open(QIODevice::ReadOnly)) {
|
void DiscordPage::fetchUserStyles() {
|
||||||
|
m_userScript.setProperty(
|
||||||
|
"loadingMessage", "Loading userstyles: Fetching additional resources...");
|
||||||
|
bool foundImport = true;
|
||||||
|
auto match = importRegex.match(m_userStylesContent);
|
||||||
|
if (!match.hasMatch()) {
|
||||||
|
foundImport = false;
|
||||||
|
match = urlRegex.match(m_userStylesContent);
|
||||||
|
}
|
||||||
|
if (match.hasMatch()) {
|
||||||
|
auto url = match.captured(1);
|
||||||
|
qDebug(userstylesLog) << "Fetching" << url;
|
||||||
|
m_userScript.setProperty(
|
||||||
|
"loadingMessage",
|
||||||
|
QString("Loading userstyles: Fetching %1...").arg(url));
|
||||||
|
QNetworkRequest request(url);
|
||||||
|
auto reply = m_networkAccessManager.get(request);
|
||||||
|
connect(reply, &QNetworkReply::finished, [=]() {
|
||||||
|
QByteArray content = "";
|
||||||
|
if (reply->error() == QNetworkReply::NoError) {
|
||||||
|
if (!reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
|
||||||
|
.isNull())
|
||||||
|
content =
|
||||||
|
reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
|
||||||
|
.toByteArray();
|
||||||
|
else
|
||||||
|
content = reply->readAll();
|
||||||
|
} else
|
||||||
|
qDebug(userstylesLog) << reply->errorString().toUtf8().constData();
|
||||||
|
reply->deleteLater();
|
||||||
|
m_userStylesContent = m_userStylesContent.replace(
|
||||||
|
match.captured(0), foundImport
|
||||||
|
? content
|
||||||
|
: "url(data:application/octet-stream;base64," +
|
||||||
|
content.toBase64() + ")");
|
||||||
|
fetchUserStyles();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
qDebug(userstylesLog) << "Injecting userstyles";
|
||||||
|
m_userScript.setProperty("userstyles", m_userStylesContent);
|
||||||
|
m_userScript.setProperty("loadingMessage", "");
|
||||||
|
if (!m_configLocation.exists())
|
||||||
|
m_configLocation.mkpath(".");
|
||||||
|
m_userStylesFile->open(QIODevice::WriteOnly);
|
||||||
|
m_userStylesFile->write(m_userStylesContent.toUtf8());
|
||||||
|
m_userStylesFile->close();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DiscordPage::getUserStyles(QString url) {
|
||||||
|
m_userStylesContent = url == "" ? "" : QString("@import url(%1);").arg(url);
|
||||||
|
fetchUserStyles();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DiscordPage::injectScript(
|
||||||
|
QString name, QString content,
|
||||||
|
QWebEngineScript::InjectionPoint injectionPoint) {
|
||||||
|
qDebug(mainLog) << "Injecting " << name;
|
||||||
|
|
||||||
|
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.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)) {
|
||||||
qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
|
qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
|
||||||
userscript.errorString().toLatin1().constData());
|
file.errorString().toLatin1().constData());
|
||||||
} else {
|
} else {
|
||||||
QByteArray userscriptJs = userscript.readAll();
|
(this->*inject)(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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,11 +181,10 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
|
|||||||
QWebEnginePage::PermissionGrantedByUser);
|
QWebEnginePage::PermissionGrantedByUser);
|
||||||
|
|
||||||
if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
|
if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
|
||||||
if (m_virtmicProcess.state() == QProcess::NotRunning) {
|
if (!m_userScript.isVirtmicRunning()) {
|
||||||
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";
|
"Discord can find all the audio devices";
|
||||||
m_virtmicProcess.start(QApplication::arguments()[0],
|
m_userScript.startVirtmic("None");
|
||||||
{"--virtmic", "None"});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -78,7 +192,6 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
|
|||||||
bool DiscordPage::acceptNavigationRequest(const QUrl &url,
|
bool DiscordPage::acceptNavigationRequest(const QUrl &url,
|
||||||
QWebEnginePage::NavigationType type,
|
QWebEnginePage::NavigationType type,
|
||||||
bool isMainFrame) {
|
bool isMainFrame) {
|
||||||
qDebug() << url;
|
|
||||||
if (type == QWebEnginePage::NavigationTypeLinkClicked) {
|
if (type == QWebEnginePage::NavigationTypeLinkClicked) {
|
||||||
QDesktopServices::openUrl(url);
|
QDesktopServices::openUrl(url);
|
||||||
return false;
|
return false;
|
||||||
@@ -98,46 +211,101 @@ QWebEnginePage *DiscordPage::createWindow(QWebEnginePage::WebWindowType type) {
|
|||||||
return new ExternalPage;
|
return new ExternalPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DiscordPage::stopVirtmic() {
|
const QMap<QString, QString> cssAnsiColorMap = {{"black", "30"},
|
||||||
if (m_virtmicProcess.state() == QProcess::Running) {
|
{"red", "31"},
|
||||||
qDebug() << "[virtmic] Stopping Virtmic";
|
{"green", "32"},
|
||||||
m_virtmicProcess.kill();
|
{"yellow", "33"},
|
||||||
m_virtmicProcess.waitForFinished();
|
{"blue", "34"},
|
||||||
}
|
{"magenta", "35"},
|
||||||
}
|
{"cyan", "36"},
|
||||||
|
{"white", "37"},
|
||||||
void DiscordPage::startVirtmic(QString target) {
|
{"gray", "90"},
|
||||||
if (target != "None") {
|
{"bright-red", "91"},
|
||||||
qDebug() << "[virtmic] Starting Virtmic with target" << target;
|
{"bright-green", "92"},
|
||||||
m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
|
{"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::javaScriptConsoleMessage(
|
void DiscordPage::javaScriptConsoleMessage(
|
||||||
QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
|
QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
|
||||||
int lineNumber, const QString &sourceID) {
|
int lineNumber, const QString &sourceID) {
|
||||||
if (message == "!discord-screenaudio-start-stream") {
|
auto colorSegments = message.split("%c");
|
||||||
if (m_streamDialog.isHidden())
|
if (colorSegments[0] != "") {
|
||||||
m_streamDialog.setHidden(false);
|
for (auto line : colorSegments[0].split("\n"))
|
||||||
else
|
qDebug(discordLog) << line.toUtf8().constData();
|
||||||
m_streamDialog.activateWindow();
|
}
|
||||||
m_streamDialog.updateTargets();
|
for (auto segment : colorSegments.mid(1)) {
|
||||||
} else if (message == "!discord-screenaudio-stream-stopped") {
|
auto lines = segment.split("\n");
|
||||||
stopVirtmic();
|
QString ansi;
|
||||||
} else {
|
uint endOfStyles = lines.length();
|
||||||
qDebug() << "[discord]" << message;
|
for (auto 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[endOfStyles].trimmed())
|
||||||
|
.toUtf8()
|
||||||
|
.constData();
|
||||||
|
for (auto line : lines.mid(endOfStyles + 1)) {
|
||||||
|
qDebug(discordLog) << line.toUtf8().constData();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DiscordPage::startStream(QString target, uint width, uint height,
|
UserScript *DiscordPage::userScript() { return &m_userScript; }
|
||||||
uint frameRate) {
|
|
||||||
stopVirtmic();
|
void DiscordPage::setupArrpc() {
|
||||||
startVirtmic(target);
|
QFile nodejs("/usr/bin/node");
|
||||||
// Wait a bit for the virtmic to start
|
if (nodejs.exists()) {
|
||||||
QTimer::singleShot(target == "None" ? 0 : 200, [=]() {
|
auto arrpcSource = QTemporaryFile::createNativeFile(":/assets/arrpc.js");
|
||||||
runJavaScript(QString("window.discordScreenaudioStartStream(%1, %2, %3);")
|
qDebug(mainLog).noquote()
|
||||||
.arg(width)
|
<< "NodeJS found, starting arRPC located at" << arrpcSource->fileName();
|
||||||
.arg(height)
|
m_arrpcProcess.setProcessChannelMode(QProcess::ForwardedChannels);
|
||||||
.arg(frameRate));
|
m_arrpcProcess.setProgram(nodejs.fileName());
|
||||||
});
|
m_arrpcProcess.setArguments(QStringList{arrpcSource->fileName()});
|
||||||
|
m_arrpcProcess.start();
|
||||||
|
|
||||||
|
injectFile(&DiscordPage::injectScript, "arrpc_bridge_mod.js",
|
||||||
|
":/assets/arrpc_bridge_mod.js");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,35 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "streamdialog.h"
|
#include "userscript.h"
|
||||||
#include "virtmic.h"
|
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QNetworkAccessManager>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
#include <QStandardPaths>
|
||||||
#include <QWebEngineFullScreenRequest>
|
#include <QWebEngineFullScreenRequest>
|
||||||
#include <QWebEnginePage>
|
#include <QWebEnginePage>
|
||||||
|
#include <QWebEngineScript>
|
||||||
|
|
||||||
class DiscordPage : public QWebEnginePage {
|
class DiscordPage : public QWebEnginePage {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit DiscordPage(QWidget *parent = nullptr);
|
explicit DiscordPage(QWidget *parent = nullptr);
|
||||||
|
UserScript *userScript();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
StreamDialog m_streamDialog;
|
UserScript m_userScript;
|
||||||
QProcess m_virtmicProcess;
|
QFile *m_userStylesFile;
|
||||||
|
QString m_userStylesContent;
|
||||||
|
QNetworkAccessManager m_networkAccessManager;
|
||||||
|
QProcess m_arrpcProcess;
|
||||||
|
const QDir m_configLocation =
|
||||||
|
QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
|
||||||
|
void setupPermissions();
|
||||||
|
void setupUserStyles();
|
||||||
|
void setupArrpc();
|
||||||
|
void fetchUserStyles();
|
||||||
bool acceptNavigationRequest(const QUrl &url,
|
bool acceptNavigationRequest(const QUrl &url,
|
||||||
QWebEnginePage::NavigationType type,
|
QWebEnginePage::NavigationType type,
|
||||||
bool isMainFrame) override;
|
bool isMainFrame) override;
|
||||||
@@ -24,14 +38,19 @@ private:
|
|||||||
javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
|
javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
|
||||||
const QString &message, int lineNumber,
|
const QString &message, int lineNumber,
|
||||||
const QString &sourceID) override;
|
const QString &sourceID) override;
|
||||||
void injectScript(QString source);
|
void injectScript(QString name, QString content,
|
||||||
void stopVirtmic();
|
QWebEngineScript::InjectionPoint injectionPoint);
|
||||||
void startVirtmic(QString target);
|
void injectScript(QString name, QString content);
|
||||||
|
void injectStylesheet(QString name, QString content);
|
||||||
|
void injectFile(void (DiscordPage::*inject)(QString, QString), QString name,
|
||||||
|
QString source);
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void featurePermissionRequested(const QUrl &securityOrigin,
|
void featurePermissionRequested(const QUrl &securityOrigin,
|
||||||
QWebEnginePage::Feature feature);
|
QWebEnginePage::Feature feature);
|
||||||
void startStream(QString target, uint width, uint height, uint frameRate);
|
|
||||||
|
public Q_SLOTS:
|
||||||
|
void getUserStyles(QString url);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Will immediately get destroyed again but is needed for navigation to
|
// Will immediately get destroyed again but is needed for navigation to
|
||||||
|
|||||||
8
src/log.cpp
Normal file
8
src/log.cpp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#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");
|
||||||
|
Q_LOGGING_CATEGORY(userstylesLog, "userstyles");
|
||||||
10
src/log.h
Normal file
10
src/log.h
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#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);
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(userstylesLog);
|
||||||
37
src/main.cpp
37
src/main.cpp
@@ -1,13 +1,24 @@
|
|||||||
|
#include "dependencycheck.h"
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "virtmic.h"
|
#include "virtmic.h"
|
||||||
|
|
||||||
|
#ifdef KXMLGUI
|
||||||
|
#include <KAboutData>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QCommandLineParser>
|
#include <QCommandLineParser>
|
||||||
|
#include <QLoggingCategory>
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
QApplication::setApplicationName("discord-screenaudio");
|
QApplication::setApplicationName("discord-screenaudio");
|
||||||
QApplication::setApplicationVersion("1.0.0-rc.7");
|
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;
|
QCommandLineParser parser;
|
||||||
parser.setApplicationDescription(
|
parser.setApplicationDescription(
|
||||||
@@ -17,17 +28,31 @@ int main(int argc, char *argv[]) {
|
|||||||
QCommandLineOption virtmicOption("virtmic", "Start the Virtual Microphone",
|
QCommandLineOption virtmicOption("virtmic", "Start the Virtual Microphone",
|
||||||
"target");
|
"target");
|
||||||
parser.addOption(virtmicOption);
|
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);
|
parser.process(app);
|
||||||
|
|
||||||
if (parser.isSet(virtmicOption)) {
|
if (parser.isSet(virtmicOption)) {
|
||||||
Virtmic::start(parser.value(virtmicOption));
|
Virtmic::start(parser.value(virtmicOption));
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow w;
|
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"));
|
||||||
|
|
||||||
|
checkDependencies();
|
||||||
|
|
||||||
|
MainWindow w(parser.isSet(notifySendOption));
|
||||||
w.show();
|
w.show();
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "virtmic.h"
|
#include "virtmic.h"
|
||||||
|
|
||||||
|
#ifdef KNOTIFICATIONS
|
||||||
|
#include <KNotification>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
@@ -10,27 +14,34 @@
|
|||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QSpacerItem>
|
#include <QSpacerItem>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
|
#include <QTimer>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <QWebEngineScript>
|
#include <QWebEngineFullScreenRequest>
|
||||||
#include <QWebEngineScriptCollection>
|
|
||||||
#include <QWebEngineSettings>
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
MainWindow *MainWindow::m_instance = nullptr;
|
||||||
setupWebView();
|
|
||||||
resize(1000, 700);
|
|
||||||
showMaximized();
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::setupWebView() {
|
MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
|
||||||
auto page = new DiscordPage(this);
|
: QMainWindow(parent) {
|
||||||
connect(page, &QWebEnginePage::fullScreenRequested, this,
|
assert(MainWindow::m_instance == nullptr);
|
||||||
&MainWindow::fullScreenRequested);
|
MainWindow::m_instance = this;
|
||||||
|
setupSettings();
|
||||||
m_webView = new QWebEngineView(this);
|
m_settings->setValue("useNotifySend", useNotifySend);
|
||||||
m_webView->setPage(page);
|
m_centralWidget = new CentralWidget(this);
|
||||||
|
setCentralWidget(m_centralWidget);
|
||||||
setCentralWidget(m_webView);
|
setupTrayIcon();
|
||||||
|
setMinimumSize(800, 300);
|
||||||
|
if (m_settings->contains("geometry")) {
|
||||||
|
restoreGeometry(m_settings->value("geometry").toByteArray());
|
||||||
|
} else {
|
||||||
|
resize(1000, 700);
|
||||||
|
showMaximized();
|
||||||
|
}
|
||||||
|
if (m_settings->value("trayIcon", false).toBool() &&
|
||||||
|
m_settings->value("startHidden", false).toBool()) {
|
||||||
|
hide();
|
||||||
|
QTimer::singleShot(0, [=]() { hide(); });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::fullScreenRequested(
|
void MainWindow::fullScreenRequested(
|
||||||
@@ -44,4 +55,79 @@ void MainWindow::fullScreenRequested(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::closeEvent(QCloseEvent *event) { QApplication::quit(); }
|
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("discord-screenaudio", "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 {
|
||||||
|
m_settings->setValue("geometry", saveGeometry());
|
||||||
|
QApplication::quit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MainWindow *MainWindow::instance() { return m_instance; }
|
||||||
|
|
||||||
|
CentralWidget *MainWindow::centralWidget() {
|
||||||
|
return instance()->m_centralWidget;
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,29 +1,39 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "discordpage.h"
|
#include "centralwidget.h"
|
||||||
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
#include <QMenu>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
|
#include <QSettings>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
#include <QSystemTrayIcon>
|
||||||
|
#include <QVBoxLayout>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QWebEnginePage>
|
|
||||||
#include <QWebEngineProfile>
|
|
||||||
#include <QWebEngineView>
|
|
||||||
|
|
||||||
class MainWindow : public QMainWindow {
|
class MainWindow : public QMainWindow {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit MainWindow(QWidget *parent = nullptr);
|
explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
|
||||||
|
static MainWindow *instance();
|
||||||
|
QSettings *settings() const;
|
||||||
|
static CentralWidget *centralWidget();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void setupWebView();
|
void setupTrayIcon();
|
||||||
QWebEngineView *m_webView;
|
void cleanTrayIcon();
|
||||||
|
void setupSettings();
|
||||||
QWebEngineProfile *prepareProfile();
|
QWebEngineProfile *prepareProfile();
|
||||||
DiscordPage *m_discordPage;
|
|
||||||
void closeEvent(QCloseEvent *event) override;
|
void closeEvent(QCloseEvent *event) override;
|
||||||
|
QSystemTrayIcon *m_trayIcon = nullptr;
|
||||||
|
QMenu *m_trayIconMenu;
|
||||||
|
QSettings *m_settings;
|
||||||
bool m_wasMaximized;
|
bool m_wasMaximized;
|
||||||
|
static MainWindow *m_instance;
|
||||||
|
CentralWidget *m_centralWidget;
|
||||||
|
|
||||||
private Q_SLOTS:
|
public Q_SLOTS:
|
||||||
|
void setTrayIcon(bool enabled);
|
||||||
void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
|
void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,70 +9,109 @@
|
|||||||
#include <QSizePolicy>
|
#include <QSizePolicy>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
StreamDialog::StreamDialog() : QWidget() {
|
StreamDialog::StreamDialog(QWidget *parent) : QDialog(parent) {
|
||||||
setAttribute(Qt::WA_QuitOnClose, false);
|
setAttribute(Qt::WA_QuitOnClose, false);
|
||||||
|
|
||||||
auto layout = new QVBoxLayout(this);
|
{
|
||||||
|
auto layout = new QVBoxLayout(this);
|
||||||
|
layout->setSizeConstraint(QLayout::SetFixedSize);
|
||||||
|
|
||||||
auto targetLabel = new QLabel(this);
|
m_videoGroupBox = new QGroupBox(this);
|
||||||
targetLabel->setText("Which app do you want to stream sound from?");
|
m_videoGroupBox->setTitle("Video");
|
||||||
layout->addWidget(targetLabel);
|
m_videoGroupBox->setCheckable(true);
|
||||||
|
layout->addWidget(m_videoGroupBox);
|
||||||
|
|
||||||
m_targetComboBox = new QComboBox(this);
|
{
|
||||||
updateTargets();
|
auto videoLayout = new QVBoxLayout(m_videoGroupBox);
|
||||||
layout->addWidget(m_targetComboBox);
|
|
||||||
|
|
||||||
auto qualityLabel = new QLabel(this);
|
auto resolutionLabel = new QLabel(this);
|
||||||
qualityLabel->setText("Stream Quality");
|
resolutionLabel->setText("Resolution");
|
||||||
layout->addWidget(qualityLabel);
|
videoLayout->addWidget(resolutionLabel);
|
||||||
|
|
||||||
auto qualityHBox = new QHBoxLayout(this);
|
m_resolutionComboBox = new QComboBox(this);
|
||||||
layout->addLayout(qualityHBox);
|
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);
|
||||||
|
|
||||||
m_qualityResolutionComboBox = new QComboBox(this);
|
auto framerateLabel = new QLabel(this);
|
||||||
m_qualityResolutionComboBox->addItem("2160p", "3840x2160");
|
framerateLabel->setText("Framerate");
|
||||||
m_qualityResolutionComboBox->addItem("1440p", "2560x1440");
|
videoLayout->addWidget(framerateLabel);
|
||||||
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_framerateComboBox = new QComboBox(this);
|
||||||
m_qualityFPSComboBox->addItem("144 FPS", 144);
|
m_framerateComboBox->addItem("144 FPS", 144);
|
||||||
m_qualityFPSComboBox->addItem("60 FPS", 60);
|
m_framerateComboBox->addItem("60 FPS", 60);
|
||||||
m_qualityFPSComboBox->addItem("30 FPS", 30);
|
m_framerateComboBox->addItem("30 FPS", 30);
|
||||||
m_qualityFPSComboBox->addItem("15 FPS", 15);
|
m_framerateComboBox->addItem("15 FPS", 15);
|
||||||
m_qualityFPSComboBox->addItem("5 FPS", 5);
|
m_framerateComboBox->addItem("5 FPS", 5);
|
||||||
m_qualityFPSComboBox->setCurrentText("30 FPS");
|
m_framerateComboBox->setCurrentText("30 FPS");
|
||||||
qualityHBox->addWidget(m_qualityFPSComboBox);
|
videoLayout->addWidget(m_framerateComboBox);
|
||||||
|
}
|
||||||
|
|
||||||
auto button = new QPushButton(this);
|
m_audioGroupBox = new QGroupBox(this);
|
||||||
button->setText("Start Stream");
|
m_audioGroupBox->setCheckable(true);
|
||||||
connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
|
m_audioGroupBox->setTitle("Audio");
|
||||||
layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
|
layout->addWidget(m_audioGroupBox);
|
||||||
|
|
||||||
setLayout(layout);
|
{
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
setWindowTitle("discord-screenaudio Stream Dialog");
|
setWindowTitle("discord-screenaudio Stream Dialog");
|
||||||
setFixedSize(0, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void StreamDialog::startStream() {
|
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].toInt(),
|
||||||
resolution[0].toUInt(), resolution[1].toUInt(),
|
resolution[1].toInt(),
|
||||||
m_qualityFPSComboBox->currentData().toUInt());
|
m_framerateComboBox->currentData().toInt(),
|
||||||
|
m_targetComboBox->currentText());
|
||||||
setHidden(true);
|
setHidden(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void StreamDialog::updateTargets() {
|
void StreamDialog::updateTargets() {
|
||||||
|
auto lastTarget = m_targetComboBox->currentText();
|
||||||
|
|
||||||
m_targetComboBox->clear();
|
m_targetComboBox->clear();
|
||||||
m_targetComboBox->addItem("None");
|
m_targetComboBox->addItem("[All Desktop Audio]");
|
||||||
for (auto target : Virtmic::getTargets()) {
|
for (auto target : Virtmic::getTargets()) {
|
||||||
m_targetComboBox->addItem(target);
|
m_targetComboBox->addItem(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_targetComboBox->findText(lastTarget) != -1)
|
||||||
|
m_targetComboBox->setCurrentText(lastTarget);
|
||||||
|
else
|
||||||
|
m_targetComboBox->setCurrentText("[All Desktop Audio]");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,22 +2,25 @@
|
|||||||
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
#include <QGroupBox>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
class StreamDialog : public QWidget {
|
class StreamDialog : public QDialog {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit StreamDialog();
|
explicit StreamDialog(QWidget *parent = nullptr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QComboBox *m_targetComboBox;
|
QComboBox *m_targetComboBox;
|
||||||
QComboBox *m_qualityResolutionComboBox;
|
QComboBox *m_resolutionComboBox;
|
||||||
QComboBox *m_qualityFPSComboBox;
|
QComboBox *m_framerateComboBox;
|
||||||
|
QGroupBox *m_videoGroupBox;
|
||||||
|
QGroupBox *m_audioGroupBox;
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void requestedStreamStart(QString target, uint width, uint height,
|
void requestedStreamStart(bool video, bool audio, int width, int height,
|
||||||
uint frameRate);
|
int frameRate, QString target);
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void updateTargets();
|
void updateTargets();
|
||||||
|
|||||||
180
src/userscript.cpp
Normal file
180
src/userscript.cpp
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
#include "userscript.h"
|
||||||
|
#include "log.h"
|
||||||
|
#include "mainwindow.h"
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QInputDialog>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#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(toggleDeafenAction, &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();
|
||||||
|
}
|
||||||
|
|
||||||
|
void UserScript::showThemeDialog() {
|
||||||
|
auto url = QInputDialog::getText(MainWindow::instance(), "Theme Installation",
|
||||||
|
"Please enter the URL of the Theme");
|
||||||
|
if (url != "")
|
||||||
|
emit shouldInstallUserStyles(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UserScript::installUserStyles(QString url) {
|
||||||
|
emit shouldInstallUserStyles(url);
|
||||||
|
}
|
||||||
83
src/userscript.h
Normal file
83
src/userscript.h
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
#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
|
||||||
|
|
||||||
|
#ifdef KNOTIFICATIONS
|
||||||
|
#include <KNotification>
|
||||||
|
#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);
|
||||||
|
Q_PROPERTY(QString userstyles MEMBER m_userstyles NOTIFY userstylesChanged);
|
||||||
|
Q_PROPERTY(QString loadingMessage MEMBER m_loadingMessage NOTIFY
|
||||||
|
loadingMessageChanged);
|
||||||
|
|
||||||
|
private:
|
||||||
|
QProcess m_virtmicProcess;
|
||||||
|
StreamDialog *m_streamDialog;
|
||||||
|
bool m_kxmlgui = false;
|
||||||
|
bool m_kglobalaccel = false;
|
||||||
|
QString m_userstyles;
|
||||||
|
QString m_loadingMessage;
|
||||||
|
#ifdef KXMLGUI
|
||||||
|
KHelpMenu *m_helpMenu;
|
||||||
|
#ifdef KGLOBALACCEL
|
||||||
|
KActionCollection *m_actionCollection;
|
||||||
|
KShortcutsDialog *m_shortcutsDialog;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
void setupHelpMenu();
|
||||||
|
void setupShortcutsDialog();
|
||||||
|
void setupStreamDialog();
|
||||||
|
void setupVirtmic();
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
void muteToggled();
|
||||||
|
void deafenToggled();
|
||||||
|
void streamStarted(bool video, int width, int height, int frameRate);
|
||||||
|
void userstylesChanged();
|
||||||
|
void loadingMessageChanged(QString message);
|
||||||
|
void shouldInstallUserStyles(QString url);
|
||||||
|
|
||||||
|
public Q_SLOTS:
|
||||||
|
void log(QString message);
|
||||||
|
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);
|
||||||
|
void showThemeDialog();
|
||||||
|
void installUserStyles(QString url);
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void startStream(bool video, bool audio, int width, int height, int frameRate,
|
||||||
|
QString target);
|
||||||
|
};
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
#include "virtmic.h"
|
#include "virtmic.h"
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
#include <rohrkabel/loop/main.hpp>
|
#include <rohrkabel/loop/main.hpp>
|
||||||
#include <rohrkabel/registry/registry.hpp>
|
#include <rohrkabel/registry/registry.hpp>
|
||||||
|
|
||||||
namespace Virtmic {
|
namespace Virtmic {
|
||||||
|
|
||||||
|
const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
|
||||||
|
|
||||||
QVector<QString> getTargets() {
|
QVector<QString> getTargets() {
|
||||||
auto main_loop = pipewire::main_loop();
|
auto main_loop = pipewire::main_loop();
|
||||||
auto context = pipewire::context(main_loop);
|
auto context = pipewire::context(main_loop);
|
||||||
@@ -19,11 +22,17 @@ QVector<QString> getTargets() {
|
|||||||
if (global.type == pipewire::node::type) {
|
if (global.type == pipewire::node::type) {
|
||||||
auto node = reg.bind<pipewire::node>(global.id);
|
auto node = reg.bind<pipewire::node>(global.id);
|
||||||
auto info = node.info();
|
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 (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);
|
||||||
targets.append(name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -64,20 +73,28 @@ void start(QString _target) {
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto &parent = nodes.at(parent_id);
|
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 (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(name))
|
||||||
{virt_fr->info().id, port_id}));
|
.arg(port_id)
|
||||||
std::cout << "[virtmic] " << virt_fr->info().id << std::endl;
|
.arg(fl ? virt_fl->info().id
|
||||||
}
|
: virt_fr->info().id)
|
||||||
|
.toUtf8()
|
||||||
|
.data();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -93,7 +110,7 @@ void start(QString _target) {
|
|||||||
pipewire::node::type, pipewire::node::version,
|
pipewire::node::type, pipewire::node::version,
|
||||||
pipewire::update_strategy::none);
|
pipewire::update_strategy::none);
|
||||||
|
|
||||||
if (target == "None") {
|
if (target == "[None]") {
|
||||||
while (true) {
|
while (true) {
|
||||||
main_loop.run();
|
main_loop.run();
|
||||||
}
|
}
|
||||||
@@ -105,9 +122,19 @@ void start(QString _target) {
|
|||||||
[&](const pipewire::global &global) {
|
[&](const pipewire::global &global) {
|
||||||
if (global.type == pipewire::node::type) {
|
if (global.type == pipewire::node::type) {
|
||||||
auto node = reg.bind<pipewire::node>(global.id);
|
auto node = reg.bind<pipewire::node>(global.id);
|
||||||
std::cout << "[virtmic] "
|
auto info = node.info();
|
||||||
<< "Added : " << node.info().props["node.name"]
|
std::string name;
|
||||||
<< std::endl;
|
if (info.props.count("application.name") &&
|
||||||
|
info.props["application.name"] != "")
|
||||||
|
name = info.props["application.name"];
|
||||||
|
else if (info.props.count("application.process.binary")) {
|
||||||
|
name = info.props["application.process.binary"];
|
||||||
|
} else
|
||||||
|
return;
|
||||||
|
qDebug(virtmicLog) << QString("Added: %1")
|
||||||
|
.arg(QString::fromStdString(name))
|
||||||
|
.toUtf8()
|
||||||
|
.data();
|
||||||
|
|
||||||
if (!nodes.count(global.id)) {
|
if (!nodes.count(global.id)) {
|
||||||
nodes.emplace(global.id, node.info());
|
nodes.emplace(global.id, node.info());
|
||||||
@@ -141,8 +168,16 @@ void start(QString _target) {
|
|||||||
[&](const std::uint32_t id) {
|
[&](const std::uint32_t id) {
|
||||||
if (nodes.count(id)) {
|
if (nodes.count(id)) {
|
||||||
auto info = nodes.at(id);
|
auto info = nodes.at(id);
|
||||||
std::cout << "[virtmic] "
|
std::string name;
|
||||||
<< "Removed: " << info.props["node.name"] << std::endl;
|
if (info.props.count("application.name") &&
|
||||||
|
info.props["application.name"] != "")
|
||||||
|
name = info.props["application.name"];
|
||||||
|
else
|
||||||
|
name = info.props["application.process.binary"];
|
||||||
|
qDebug(virtmicLog) << QString("Removed: %1")
|
||||||
|
.arg(QString::fromStdString(name))
|
||||||
|
.toUtf8()
|
||||||
|
.data();
|
||||||
nodes.erase(id);
|
nodes.erase(id);
|
||||||
}
|
}
|
||||||
if (ports.count(id)) {
|
if (ports.count(id)) {
|
||||||
|
|||||||
164
version.cmake
Normal file
164
version.cmake
Normal file
@@ -0,0 +1,164 @@
|
|||||||
|
# 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()
|
||||||
|
|
||||||
Reference in New Issue
Block a user